| Message ID | 20241101094050.2421038-3-ruanjinjie@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | media: Fix pm_runtime_set_suspended() with runtime pm enabled | expand |
On 01/11/2024 09:40, Jinjie Ruan wrote: > It is not valid to call pm_runtime_set_suspended() for devices > with runtime PM enabled because it returns -EAGAIN if it is enabled > already and working. So, call pm_runtime_disable() before to fix it. > > Cc: stable@vger.kernel.org > Fixes: b50a64fc54af ("media: amphion: add amphion vpu device driver") > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> > --- > v2: > - Add fix tag. > - Add Cc stable. > --- > drivers/media/platform/amphion/vpu_drv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/platform/amphion/vpu_drv.c b/drivers/media/platform/amphion/vpu_drv.c > index 2bf70aafd2ba..51d5234869f5 100644 > --- a/drivers/media/platform/amphion/vpu_drv.c > +++ b/drivers/media/platform/amphion/vpu_drv.c > @@ -151,8 +151,8 @@ static int vpu_probe(struct platform_device *pdev) > media_device_cleanup(&vpu->mdev); > v4l2_device_unregister(&vpu->v4l2_dev); > err_vpu_deinit: > - pm_runtime_set_suspended(dev); > pm_runtime_disable(dev); > + pm_runtime_set_suspended(dev); > > return ret; > } Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
diff --git a/drivers/media/platform/amphion/vpu_drv.c b/drivers/media/platform/amphion/vpu_drv.c index 2bf70aafd2ba..51d5234869f5 100644 --- a/drivers/media/platform/amphion/vpu_drv.c +++ b/drivers/media/platform/amphion/vpu_drv.c @@ -151,8 +151,8 @@ static int vpu_probe(struct platform_device *pdev) media_device_cleanup(&vpu->mdev); v4l2_device_unregister(&vpu->v4l2_dev); err_vpu_deinit: - pm_runtime_set_suspended(dev); pm_runtime_disable(dev); + pm_runtime_set_suspended(dev); return ret; }
It is not valid to call pm_runtime_set_suspended() for devices with runtime PM enabled because it returns -EAGAIN if it is enabled already and working. So, call pm_runtime_disable() before to fix it. Cc: stable@vger.kernel.org Fixes: b50a64fc54af ("media: amphion: add amphion vpu device driver") Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- v2: - Add fix tag. - Add Cc stable. --- drivers/media/platform/amphion/vpu_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)