Commit 37af43b2 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Mauro Carvalho Chehab
Browse files

media: hantro: Fix probe func error path 



If clocks for some reason couldn't be enabled, probe function returns
immediately, without disabling PM. This obviously leaves PM ref counters
unbalanced.

Fix that by jumping to appropriate error path, so effects of PM functions
are reversed.

Fixes: 775fec69 ("media: add Rockchip VPU JPEG encoder driver")
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Acked-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 69a18745

drivers/staging/media/hantro/hantro_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ static int hantro_probe(struct platform_device *pdev) 
	ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks);

	if (ret) {

		dev_err(&pdev->dev, "Failed to prepare clocks\n");

		return ret;

		goto err_pm_disable;

	}



	ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev);
@@ -1037,6 +1037,7 @@ static int hantro_probe(struct platform_device *pdev) 
	v4l2_device_unregister(&vpu->v4l2_dev);

err_clk_unprepare:

	clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);

err_pm_disable:

	pm_runtime_dont_use_autosuspend(vpu->dev);

	pm_runtime_disable(vpu->dev);

	return ret;