diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index e411d46bd803..6bc4b01c8e9c 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
@@ -159,7 +159,7 @@ static void omap_disconnect_dssdevs(struct drm_device *ddev) | |||
159 | for (i = 0; i < priv->num_dssdevs; i++) { | 159 | for (i = 0; i < priv->num_dssdevs; i++) { |
160 | struct omap_dss_device *dssdev = priv->dssdevs[i]; | 160 | struct omap_dss_device *dssdev = priv->dssdevs[i]; |
161 | 161 | ||
162 | dssdev->driver->disconnect(dssdev); | 162 | omapdss_device_disconnect(dssdev, NULL); |
163 | priv->dssdevs[i] = NULL; | 163 | priv->dssdevs[i] = NULL; |
164 | omap_dss_put_device(dssdev); | 164 | omap_dss_put_device(dssdev); |
165 | } | 165 | } |
@@ -189,7 +189,7 @@ static int omap_connect_dssdevs(struct drm_device *ddev) | |||
189 | return -EPROBE_DEFER; | 189 | return -EPROBE_DEFER; |
190 | 190 | ||
191 | for_each_dss_dev(dssdev) { | 191 | for_each_dss_dev(dssdev) { |
192 | r = dssdev->driver->connect(dssdev); | 192 | r = omapdss_device_connect(dssdev, NULL); |
193 | if (r == -EPROBE_DEFER) { | 193 | if (r == -EPROBE_DEFER) { |
194 | omap_dss_put_device(dssdev); | 194 | omap_dss_put_device(dssdev); |
195 | goto cleanup; | 195 | goto cleanup; |