Merge tag 'renesas-soc-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / gpu / drm / exynos / exynos_drm_dpi.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
index fa08f05..3dc678e 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
@@ -338,12 +338,12 @@ err_del_component:
 
 int exynos_dpi_remove(struct device *dev)
 {
-       struct drm_encoder *encoder = exynos_dpi_display.encoder;
        struct exynos_dpi *ctx = exynos_dpi_display.ctx;
 
        exynos_dpi_dpms(&exynos_dpi_display, DRM_MODE_DPMS_OFF);
-       encoder->funcs->destroy(encoder);
-       drm_connector_cleanup(&ctx->connector);
+
+       if (ctx->panel)
+               drm_panel_detach(ctx->panel);
 
        exynos_drm_component_del(dev, EXYNOS_DEVICE_TYPE_CONNECTOR);