diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 4f402eb8088d..a3b7dbf1b92b 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
@@ -161,7 +161,7 @@ static void omap_disconnect_dssdevs(struct drm_device *ddev) | |||
161 | 161 | ||
162 | omapdss_device_disconnect(dssdev, NULL); | 162 | omapdss_device_disconnect(dssdev, NULL); |
163 | priv->dssdevs[i] = NULL; | 163 | priv->dssdevs[i] = NULL; |
164 | omap_dss_put_device(dssdev); | 164 | omapdss_device_put(dssdev); |
165 | } | 165 | } |
166 | 166 | ||
167 | priv->num_dssdevs = 0; | 167 | priv->num_dssdevs = 0; |
@@ -191,17 +191,17 @@ static int omap_connect_dssdevs(struct drm_device *ddev) | |||
191 | for_each_dss_display(dssdev) { | 191 | for_each_dss_display(dssdev) { |
192 | r = omapdss_device_connect(dssdev, NULL); | 192 | r = omapdss_device_connect(dssdev, NULL); |
193 | if (r == -EPROBE_DEFER) { | 193 | if (r == -EPROBE_DEFER) { |
194 | omap_dss_put_device(dssdev); | 194 | omapdss_device_put(dssdev); |
195 | goto cleanup; | 195 | goto cleanup; |
196 | } else if (r) { | 196 | } else if (r) { |
197 | dev_warn(dssdev->dev, "could not connect display: %s\n", | 197 | dev_warn(dssdev->dev, "could not connect display: %s\n", |
198 | dssdev->name); | 198 | dssdev->name); |
199 | } else { | 199 | } else { |
200 | omap_dss_get_device(dssdev); | 200 | omapdss_device_get(dssdev); |
201 | priv->dssdevs[priv->num_dssdevs++] = dssdev; | 201 | priv->dssdevs[priv->num_dssdevs++] = dssdev; |
202 | if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) { | 202 | if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) { |
203 | /* To balance the 'for_each_dss_display' loop */ | 203 | /* To balance the 'for_each_dss_display' loop */ |
204 | omap_dss_put_device(dssdev); | 204 | omapdss_device_put(dssdev); |
205 | break; | 205 | break; |
206 | } | 206 | } |
207 | } | 207 | } |