From ab59444d57cd95d79bd7fdb094dfe12ac6846524 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Fri, 20 Jul 2012 18:30:50 +0530 Subject: [PATCH] --- yaml --- r: 333582 b: refs/heads/master c: 23e2aa644f39fbc8121f49dd50ce85590cc4e4b7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_drv.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bffd809f5e6c..7897747d54f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4249e61e0440f01d279fa21d121dbf069e6620fa +refs/heads/master: 23e2aa644f39fbc8121f49dd50ce85590cc4e4b7 diff --git a/trunk/drivers/staging/omapdrm/omap_drv.c b/trunk/drivers/staging/omapdrm/omap_drv.c index 4beab9447ceb..64a354a54737 100644 --- a/trunk/drivers/staging/omapdrm/omap_drv.c +++ b/trunk/drivers/staging/omapdrm/omap_drv.c @@ -106,7 +106,8 @@ static void dump_video_chains(void) for (i = 0; i < omap_dss_get_num_overlays(); i++) { struct omap_overlay *ovl = omap_dss_get_overlay(i); struct omap_overlay_manager *mgr = ovl->manager; - struct omap_dss_device *dssdev = mgr ? mgr->device : NULL; + struct omap_dss_device *dssdev = mgr ? + mgr->get_device(mgr) : NULL; if (dssdev) { DBG("%d: %s -> %s -> %s", i, ovl->name, mgr->name, dssdev->name); @@ -185,7 +186,7 @@ static int create_connector(struct drm_device *dev, for (j = 0; j < priv->num_encoders; j++) { struct omap_overlay_manager *mgr = omap_encoder_get_manager(priv->encoders[j]); - if (mgr->device == dssdev) { + if (mgr->get_device(mgr) == dssdev) { drm_mode_connector_attach_encoder(connector, priv->encoders[j]); }