summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/omapdrm/dss/dsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/dsi.c')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/dsi.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 921e794aec0d..0afefac4bf65 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4886,15 +4886,9 @@ static int dsi_connect(struct omap_dss_device *src,
{
int r;
- r = dss_mgr_connect(dst);
- if (r)
- return r;
-
r = omapdss_device_connect(dst->dss, dst, dst->next);
- if (r) {
- dss_mgr_disconnect(dst);
+ if (r)
return r;
- }
dst->dispc_channel_connected = true;
return 0;
@@ -4906,8 +4900,6 @@ static void dsi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next);
-
- dss_mgr_disconnect(dst);
}
static const struct omap_dss_device_ops dsi_ops = {