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

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

diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c
index 9abc7ca8b6cf78ad8dba66329352c341a7c369d7..64729fa4a3d431885a9471e7c550520cd2dfb72b 100644 (file)
--- a/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@ -709,8 +709,6 @@ static int imx_tve_remove(struct platform_device *pdev)
        struct drm_connector *connector = &tve->connector;
        struct drm_encoder *encoder = &tve->encoder;
 
-       drm_mode_connector_detach_encoder(connector, encoder);
-
        imx_drm_remove_connector(tve->imx_drm_connector);
        imx_drm_remove_encoder(tve->imx_drm_encoder);