diff --git a/projects/NXP/devices/iMX8/patches/linux/0079-media-hantro-Fix-probe-func-error-path.patch b/projects/NXP/devices/iMX8/patches/linux/0079-media-hantro-Fix-probe-func-error-path.patch deleted file mode 100644 index 0ba016a116..0000000000 --- a/projects/NXP/devices/iMX8/patches/linux/0079-media-hantro-Fix-probe-func-error-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Mon, 29 Nov 2021 18:31:35 +0100 -Subject: [PATCH] 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: 775fec69008d ("media: add Rockchip VPU JPEG encoder driver") -Signed-off-by: Jernej Skrabec ---- - drivers/staging/media/hantro/hantro_drv.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c -index ab2467998d29..3d3107a39dae 100644 ---- a/drivers/staging/media/hantro/hantro_drv.c -+++ b/drivers/staging/media/hantro/hantro_drv.c -@@ -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;