diff options
author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2018-03-02 18:57:55 +0100 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2018-03-08 17:32:52 +0100 |
commit | 028a9e5c06d82aefbe4c508e045a1ee3be414cc0 (patch) | |
tree | 2863ea797457b672e018d7a53ddee404ea508dde /drivers/gpu/drm/rockchip/inno_hdmi.c | |
parent | 61b5ff96d252853d199c6d89b43521c01b6bbdf3 (diff) | |
download | linux-stable-028a9e5c06d82aefbe4c508e045a1ee3be414cc0.tar.gz linux-stable-028a9e5c06d82aefbe4c508e045a1ee3be414cc0.tar.bz2 linux-stable-028a9e5c06d82aefbe4c508e045a1ee3be414cc0.zip |
drm/rockchip: inno_hdmi: reorder clk_disable_unprepare call in unbind
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
Diffstat (limited to 'drivers/gpu/drm/rockchip/inno_hdmi.c')
-rw-r--r-- | drivers/gpu/drm/rockchip/inno_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index a5c661930250..88d0774c97bd 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -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 = { |