Commit bbe516e9 authored Jun 28, 2020 by Dinghao Liu Committed by Mauro Carvalho Chehab Aug 18, 2020

media: venus: core: Fix runtime PM imbalance in venus_probe

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced. For other error
paths after this call, things are the same.

Fix this by adding pm_runtime_put_noidle() after 'err_runtime_disable'
label. But in this case, the error path after pm_runtime_put_sync()
will decrease PM usage counter twice. Thus add an extra
pm_runtime_get_noresume() in this path to balance PM counter.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent 5cef0785

drivers/media/platform/qcom/venus/core.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -287,8 +287,10 @@ static int venus_probe(struct platform_device *pdev)
		goto err_core_deinit;

		ret = pm_runtime_put_sync(dev);
		if (ret)
		if (ret) {
		pm_runtime_get_noresume(dev);
		goto err_dev_unregister;
		}

		return 0;

		@@ -299,6 +301,7 @@ err_core_deinit:
		err_venus_shutdown:
		venus_shutdown(core);
		err_runtime_disable:
		pm_runtime_put_noidle(dev);
		pm_runtime_set_suspended(dev);
		pm_runtime_disable(dev);
		hfi_destroy(core);

Admin message