Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 788c8ddb authored by Douglas Anderson's avatar Douglas Anderson Committed by Philipp Zabel
Browse files

drm/imx: dw_hdmi: Call drm_encoder_cleanup() in error path 



The drm_encoder_cleanup() was missing both from the error path of
dw_hdmi_imx_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: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 6ac217ee

drivers/gpu/drm/imx/dw_hdmi-imx.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -245,7 +245,16 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master, 
	drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs,

	drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);

			 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_imx_unbind(struct device *dev, struct device *master,

static void dw_hdmi_imx_unbind(struct device *dev, struct device *master,