Merge tag 'v3.14' into drm-intel-next-queued

[deliverable/linux.git] / drivers / staging / imx-drm / imx-hdmi.c

diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
index 62ce0e86f14b50cfe7392bc5b47dd8871616af2b..f996e082faf4d92660885c3923e6b7a25871e928 100644 (file)
--- a/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
@@ -1883,7 +1883,6 @@ static int imx_hdmi_platform_remove(struct platform_device *pdev)
        struct drm_connector *connector = &hdmi->connector;
        struct drm_encoder *encoder = &hdmi->encoder;
 
-       drm_mode_connector_detach_encoder(connector, encoder);
        imx_drm_remove_connector(hdmi->imx_drm_connector);
        imx_drm_remove_encoder(hdmi->imx_drm_encoder);