Skip to content

Commit

Permalink
media: rockchip/vpu: Add missing dont_use_autosuspend() calls
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonas Karlman authored and Mauro Carvalho Chehab committed May 15, 2019
1 parent 76f2db0 commit 5c5b90f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@ static int rockchip_vpu_probe(struct platform_device *pdev)
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;
}
Expand All @@ -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;
}
Expand Down

0 comments on commit 5c5b90f

Please sign in to comment.