mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
media: st-delta: Fix PM disable depth imbalance in delta_probe
[ Upstream commit94e3dba710
] 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:
parent
c743342a85
commit
057552414c
1 changed files with 4 additions and 2 deletions
|
@ -1859,7 +1859,7 @@ static int delta_probe(struct platform_device *pdev)
|
|||
if (ret) {
|
||||
dev_err(delta->dev, "%s failed to initialize firmware ipc channel\n",
|
||||
DELTA_PREFIX);
|
||||
goto err;
|
||||
goto err_pm_disable;
|
||||
}
|
||||
|
||||
/* register all available decoders */
|
||||
|
@ -1873,7 +1873,7 @@ static int delta_probe(struct platform_device *pdev)
|
|||
if (ret) {
|
||||
dev_err(delta->dev, "%s failed to register V4L2 device\n",
|
||||
DELTA_PREFIX);
|
||||
goto err;
|
||||
goto err_pm_disable;
|
||||
}
|
||||
|
||||
delta->work_queue = create_workqueue(DELTA_NAME);
|
||||
|
@ -1898,6 +1898,8 @@ static int delta_probe(struct platform_device *pdev)
|
|||
destroy_workqueue(delta->work_queue);
|
||||
err_v4l2:
|
||||
v4l2_device_unregister(&delta->v4l2_dev);
|
||||
err_pm_disable:
|
||||
pm_runtime_disable(dev);
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue