diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi4.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi4.c | 10 |
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, { 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; @@ -453,8 +447,6 @@ static void hdmi_disconnect(struct omap_dss_device *src, dst->dispc_channel_connected = false; omapdss_device_disconnect(dst, dst->next); - - dss_mgr_disconnect(dst); } static int hdmi_read_edid(struct omap_dss_device *dssdev, |