Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b87d3a04 authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Greg Kroah-Hartman
Browse files

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



[ 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: f386509e ("[media] st-delta: STiH4xx multi-format video decoder v4l2 driver")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Acked-by: default avatarHugues Fruchet <hugues.fruchet@foss.st.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 12480f75

drivers/media/platform/sti/delta/delta-v4l2.c

+4 −2
Original line number Diff line number Diff line
@@ -1862,7 +1862,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 */
@@ -1876,7 +1876,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);
@@ -1901,6 +1901,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;

}