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

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

diff --git a/drivers/staging/imx-drm/imx-ldb.c b/drivers/staging/imx-drm/imx-ldb.c
index 7e593296ac47287f4929b91270ff79d34752fd56..c703e986b44c254e781f50a63cf6ac56501fc852 100644 (file)
--- a/drivers/staging/imx-drm/imx-ldb.c
+++ b/drivers/staging/imx-drm/imx-ldb.c
@@ -595,8 +595,6 @@ static int imx_ldb_remove(struct platform_device *pdev)
                struct drm_connector *connector = &channel->connector;
                struct drm_encoder *encoder = &channel->encoder;
 
-               drm_mode_connector_detach_encoder(connector, encoder);
-
                imx_drm_remove_connector(channel->imx_drm_connector);
                imx_drm_remove_encoder(channel->imx_drm_encoder);
        }