From: Douglas Anderson Date: Mon, 7 Mar 2016 22:00:50 +0000 (-0800) Subject: FROMLIST: drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path X-Git-Tag: firefly_0821_release~2950 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=65bee33dab79fc766972bfb5670f7dbfee9b1006;p=firefly-linux-kernel-4.4.55.git FROMLIST: drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path 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). (am from https://patchwork.kernel.org/patch/8523331/) Change-Id: Ibf5c39a5db304177a9f16d8dc691221512002348 Signed-off-by: Douglas Anderson Signed-off-by: Mark Yao --- diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index c65ce8cb30d3..e5d5b18a841b 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -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,