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

media: st-delta: Fix PM disable depth imbalance in delta_probe

Browse Source 
[ Upstream commit 94e3dba710fe0afc772172305444250023fc2d30 ]

The pm_runtime_enable will decrease power disable depth.
If the probe fails, we should use pm_runtime_disable() to balance
pm_runtime_enable().

Fixes: f386509e49 ("[media] st-delta: STiH4xx multi-format video decoder v4l2 driver")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Acked-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Miaoqian Lin
2022-03-07 09:08:59 +01:00
committed by Greg Kroah-Hartman
parent 8e4e0c4ac5
commit b3e4837358
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/sti/delta/delta-v4l2.c
View File

@@ -1862,7 +1862,7 @@ static int delta_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(delta->dev, "%s failed to initialize firmware ipc channel\n", dev_err(delta->dev, "%s failed to initialize firmware ipc channel\n",
DELTA_PREFIX); DELTA_PREFIX);
goto err; goto err_pm_disable;
} }
/* register all available decoders */ /* register all available decoders */
@@ -1876,7 +1876,7 @@ static int delta_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(delta->dev, "%s failed to register V4L2 device\n", dev_err(delta->dev, "%s failed to register V4L2 device\n",
DELTA_PREFIX); DELTA_PREFIX);
goto err; goto err_pm_disable;
} }
delta->work_queue = create_workqueue(DELTA_NAME); delta->work_queue = create_workqueue(DELTA_NAME);
@@ -1901,6 +1901,8 @@ err_work_queue:
destroy_workqueue(delta->work_queue); destroy_workqueue(delta->work_queue);
err_v4l2: err_v4l2:
v4l2_device_unregister(&delta->v4l2_dev); v4l2_device_unregister(&delta->v4l2_dev);
err_pm_disable:
pm_runtime_disable(dev);
err: err:
return ret; return ret;
} }