drm/rockchip: inno_hdmi: reorder clk_disable_unprepare call in unbind
authorJeffy Chen <jeffy.chen@rock-chips.com>
Fri, 2 Mar 2018 17:57:55 +0000 (18:57 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Thu, 8 Mar 2018 16:32:52 +0000 (17:32 +0100)
In bind the clk_prepare_enable of the HDMI pclk is called before adding the
i2c_adapter. So it should be the other way around in unbind, first remove
the i2c_adapter and then call the clk_disable_unprepare.

Fixes: 412d4ae6b7a5 ("drm/rockchip: hdmi: add Innosilicon HDMI support")
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180302175757.28192-4-enric.balletbo@collabora.com
drivers/gpu/drm/rockchip/inno_hdmi.c

index a5c66193025000a0c89e799aa04cd891dbad982e..88d0774c97bdc7a4f387fe79dd4de31112a38875 100644 (file)
@@ -906,8 +906,8 @@ static void inno_hdmi_unbind(struct device *dev, struct device *master,
        hdmi->connector.funcs->destroy(&hdmi->connector);
        hdmi->encoder.funcs->destroy(&hdmi->encoder);
 
-       clk_disable_unprepare(hdmi->pclk);
        i2c_put_adapter(hdmi->ddc);
+       clk_disable_unprepare(hdmi->pclk);
 }
 
 static const struct component_ops inno_hdmi_ops = {