aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/dss/hdmi4.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi4.c')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/hdmi4.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 1e025a8b99c9..c4fcdc9ed62d 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -433,15 +433,9 @@ static int hdmi_connect(struct omap_dss_device *src,
433{ 433{
434 int r; 434 int r;
435 435
436 r = dss_mgr_connect(dst);
437 if (r)
438 return r;
439
440 r = omapdss_device_connect(dst->dss, dst, dst->next); 436 r = omapdss_device_connect(dst->dss, dst, dst->next);
441 if (r) { 437 if (r)
442 dss_mgr_disconnect(dst);
443 return r; 438 return r;
444 }
445 439
446 dst->dispc_channel_connected = true; 440 dst->dispc_channel_connected = true;
447 return 0; 441 return 0;
@@ -453,8 +447,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
453 dst->dispc_channel_connected = false; 447 dst->dispc_channel_connected = false;
454 448
455 omapdss_device_disconnect(dst, dst->next); 449 omapdss_device_disconnect(dst, dst->next);
456
457 dss_mgr_disconnect(dst);
458} 450}
459 451
460static int hdmi_read_edid(struct omap_dss_device *dssdev, 452static int hdmi_read_edid(struct omap_dss_device *dssdev,