diff options
| -rw-r--r-- | drivers/staging/omapdrm/omap_drv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c index 4beab9447ceb..64a354a54737 100644 --- a/drivers/staging/omapdrm/omap_drv.c +++ b/drivers/staging/omapdrm/omap_drv.c | |||
| @@ -106,7 +106,8 @@ static void dump_video_chains(void) | |||
| 106 | for (i = 0; i < omap_dss_get_num_overlays(); i++) { | 106 | for (i = 0; i < omap_dss_get_num_overlays(); i++) { |
| 107 | struct omap_overlay *ovl = omap_dss_get_overlay(i); | 107 | struct omap_overlay *ovl = omap_dss_get_overlay(i); |
| 108 | struct omap_overlay_manager *mgr = ovl->manager; | 108 | struct omap_overlay_manager *mgr = ovl->manager; |
| 109 | struct omap_dss_device *dssdev = mgr ? mgr->device : NULL; | 109 | struct omap_dss_device *dssdev = mgr ? |
| 110 | mgr->get_device(mgr) : NULL; | ||
| 110 | if (dssdev) { | 111 | if (dssdev) { |
| 111 | DBG("%d: %s -> %s -> %s", i, ovl->name, mgr->name, | 112 | DBG("%d: %s -> %s -> %s", i, ovl->name, mgr->name, |
| 112 | dssdev->name); | 113 | dssdev->name); |
| @@ -185,7 +186,7 @@ static int create_connector(struct drm_device *dev, | |||
| 185 | for (j = 0; j < priv->num_encoders; j++) { | 186 | for (j = 0; j < priv->num_encoders; j++) { |
| 186 | struct omap_overlay_manager *mgr = | 187 | struct omap_overlay_manager *mgr = |
| 187 | omap_encoder_get_manager(priv->encoders[j]); | 188 | omap_encoder_get_manager(priv->encoders[j]); |
| 188 | if (mgr->device == dssdev) { | 189 | if (mgr->get_device(mgr) == dssdev) { |
| 189 | drm_mode_connector_attach_encoder(connector, | 190 | drm_mode_connector_attach_encoder(connector, |
| 190 | priv->encoders[j]); | 191 | priv->encoders[j]); |
| 191 | } | 192 | } |
