xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: rkisp1: Disable runtime PM in probe error path

Browse Source 
[ Upstream commit 13c9810281f8b24af9b7712cd84a1fce61843e93 ]

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>
Stable-dep-of: 452f604a4683 ("media: rkisp1: Fix media device memory leak")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Laurent Pinchart
2022-06-14 20:10:36 +01:00
committed by Greg Kroah-Hartman
parent 962b35733b
commit b864287581
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/media/rkisp1/rkisp1-dev.c
View File

@@ -518,7 +518,7 @@ static int rkisp1_probe(struct platform_device *pdev)
ret = v4l2_device_register(rkisp1->dev, &rkisp1->v4l2_dev); ret = v4l2_device_register(rkisp1->dev, &rkisp1->v4l2_dev);
if (ret) if (ret)
return ret; goto err_pm_runtime_disable;
ret = media_device_register(&rkisp1->media_dev); ret = media_device_register(&rkisp1->media_dev);
if (ret) { if (ret) {
@@ -538,6 +538,7 @@ err_unreg_media_dev:
media_device_unregister(&rkisp1->media_dev); media_device_unregister(&rkisp1->media_dev);
err_unreg_v4l2_dev: err_unreg_v4l2_dev:
v4l2_device_unregister(&rkisp1->v4l2_dev); v4l2_device_unregister(&rkisp1->v4l2_dev);
err_pm_runtime_disable:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
return ret; return ret;
} }