drm/rockchip: dsi: Fix unbalanced clock on probe error
authorBrian Norris <briannorris@chromium.org>
Tue, 28 Sep 2021 21:35:51 +0000 (14:35 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 10:03:02 +0000 (11:03 +0100)
[ Upstream commit 251888398753924059f3bb247a44153a2853137f ]

Our probe() function never enabled this clock, so we shouldn't disable
it if we fail to probe the bridge.

Noted by inspection.

Fixes: 2d4f7bdafd70 ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Tested-by: NĂ­colas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210928143413.v3.3.Ie8ceefb51ab6065a1151869b6fcda41a467d4d2c@changeid
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c

index a2262bee5aa47760a909079cb330e97c6b59ac18..b7eaffafbccbccdb0e57e1a42f4168ee40d51ad8 100644 (file)
@@ -1397,14 +1397,10 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev)
                if (ret != -EPROBE_DEFER)
                        DRM_DEV_ERROR(dev,
                                      "Failed to probe dw_mipi_dsi: %d\n", ret);
-               goto err_clkdisable;
+               return ret;
        }
 
        return 0;
-
-err_clkdisable:
-       clk_disable_unprepare(dsi->pllref_clk);
-       return ret;
 }
 
 static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)