summaryrefslogtreecommitdiff
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.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 118c015624b9..5216c5554741 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -458,7 +458,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r)
return r;
- r = dss_mgr_connect(&hdmi->output, dssdev);
+ r = dss_mgr_connect(dssdev);
if (r)
return r;
@@ -466,7 +466,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r) {
DSSERR("failed to connect output to new device: %s\n",
dst->name);
- dss_mgr_disconnect(&hdmi->output, dssdev);
+ dss_mgr_disconnect(dssdev);
return r;
}
@@ -476,11 +476,9 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
static void hdmi_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
{
- struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
-
omapdss_output_unset_device(dssdev);
- dss_mgr_disconnect(&hdmi->output, dssdev);
+ dss_mgr_disconnect(dssdev);
}
static int hdmi_read_edid(struct omap_dss_device *dssdev,