diff options
| author |   Jonas Karlman <jonas@kwiboo.se> | 2019-04-25 03:12:28 -0400 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-05-15 05:37:58 -0400 |
| commit | 5c5b90f5cbad77dc15d8b5582efdb2e362bcd710 (patch) | |
| tree | 920dc1c26ea944425e09d4230f0a8ccb95f55972 /drivers/staging | |
| parent | media: rockchip/vpu: Do not request id 0 for our video device (diff) | |
| download | linux-dev-5c5b90f5cbad77dc15d8b5582efdb2e362bcd710.tar.xz linux-dev-5c5b90f5cbad77dc15d8b5582efdb2e362bcd710.zip | |
media: rockchip/vpu: Add missing dont_use_autosuspend() calls
Those calls are needed to restore a clean PM state when the probe fails
or when the driver is unloaded such that future ->probe() calls can
initialize runtime PM again.
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c index c00e2b47d5c1..b25e93daafde 100644 --- a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c +++ b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c @@ -489,6 +489,7 @@ err_v4l2_unreg: v4l2_device_unregister(&vpu->v4l2_dev); err_clk_unprepare: clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks); + pm_runtime_dont_use_autosuspend(vpu->dev); pm_runtime_disable(vpu->dev); return ret; } @@ -509,6 +510,7 @@ static int rockchip_vpu_remove(struct platform_device *pdev) } v4l2_device_unregister(&vpu->v4l2_dev); clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks); + pm_runtime_dont_use_autosuspend(vpu->dev); pm_runtime_disable(vpu->dev); return 0; } |