drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path
authorDouglas Anderson <dianders@chromium.org>
Mon, 7 Mar 2016 22:00:50 +0000 (14:00 -0800)
committerMark Yao <mark.yao@rock-chips.com>
Mon, 28 Mar 2016 06:48:31 +0000 (14:48 +0800)
The drm_encoder_cleanup() was missing both from the error path of
dw_hdmi_rockchip_bind().  This caused a crash when slub_debug was
enabled and we ended up deferring probe of HDMI at boot.

This call isn't needed from unbind() because if dw_hdmi_bind() returns
no error then it takes over the job of freeing the encoder (in
dw_hdmi_unbind).

Signed-off-by: Douglas Anderson <dianders@chromium.org>
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

index 3d3cf2f8891e5d584807f6601b9e2b6f3ca2c23a..88776aba984eff2e6ab37d39af7259fd9cdd9569 100644 (file)
@@ -293,7 +293,16 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
        drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,
                         DRM_MODE_ENCODER_TMDS, NULL);
 
-       return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data);
+       ret = dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data);
+
+       /*
+        * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(),
+        * which would have called the encoder cleanup.  Do it manually.
+        */
+       if (ret)
+               drm_encoder_cleanup(encoder);
+
+       return ret;
 }
 
 static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master,