media: rkisp1: Disable runtime PM in probe error path
If the v4l2_device_register() call fails, runtime PM is left enabled. Fix it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
2f348f76d4
commit
13c9810281
|
@ -523,7 +523,7 @@ static int rkisp1_probe(struct platform_device *pdev)
|
|||
|
||||
ret = v4l2_device_register(rkisp1->dev, &rkisp1->v4l2_dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto err_pm_runtime_disable;
|
||||
|
||||
ret = media_device_register(&rkisp1->media_dev);
|
||||
if (ret) {
|
||||
|
@ -543,6 +543,7 @@ err_unreg_media_dev:
|
|||
media_device_unregister(&rkisp1->media_dev);
|
||||
err_unreg_v4l2_dev:
|
||||
v4l2_device_unregister(&rkisp1->v4l2_dev);
|
||||
err_pm_runtime_disable:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue