From 6fc555a9add5bff98e9d5dc5a278ea99e8b9b673 Mon Sep 17 00:00:00 2001
From: Archit Taneja <archit@ti.com>
Date: Fri, 20 Jul 2012 18:26:56 +0530
Subject: [PATCH] --- yaml --- r: 333581 b: refs/heads/master c:
 4249e61e0440f01d279fa21d121dbf069e6620fa h: refs/heads/master i:   333579:
 6efad81bf795ee014d91b7da583a26f048a62e5e v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/video/omap2/omapfb/omapfb-main.c | 6 ++++--
 trunk/drivers/video/omap2/omapfb/omapfb.h      | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e0cb183dc7db..bffd809f5e6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d629f03f748c46277c421ed5b892f0b39fd1fe47
+refs/heads/master: 4249e61e0440f01d279fa21d121dbf069e6620fa
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
index 77ae9edbf2cd..b103793516db 100644
--- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2379,6 +2379,7 @@ static int __init omapfb_probe(struct platform_device *pdev)
 	struct omap_overlay *ovl;
 	struct omap_dss_device *def_display;
 	struct omap_dss_device *dssdev;
+	struct omap_dss_device *ovl_device;
 
 	DBG("omapfb_probe\n");
 
@@ -2452,8 +2453,9 @@ static int __init omapfb_probe(struct platform_device *pdev)
 	/* gfx overlay should be the default one. find a display
 	 * connected to that, and use it as default display */
 	ovl = omap_dss_get_overlay(0);
-	if (ovl->manager && ovl->manager->device) {
-		def_display = ovl->manager->device;
+	ovl_device = ovl->get_device(ovl);
+	if (ovl_device) {
+		def_display = ovl_device;
 	} else {
 		dev_warn(&pdev->dev, "cannot find default display\n");
 		def_display = NULL;
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb.h b/trunk/drivers/video/omap2/omapfb/omapfb.h
index 30361a09aecd..5ced9b334d35 100644
--- a/trunk/drivers/video/omap2/omapfb/omapfb.h
+++ b/trunk/drivers/video/omap2/omapfb/omapfb.h
@@ -148,8 +148,9 @@ static inline struct omap_dss_device *fb2display(struct fb_info *fbi)
 
 	/* XXX: returns the display connected to first attached overlay */
 	for (i = 0; i < ofbi->num_overlays; i++) {
-		if (ofbi->overlays[i]->manager)
-			return ofbi->overlays[i]->manager->device;
+		struct omap_overlay *ovl = ofbi->overlays[i];
+
+		return ovl->get_device(ovl);
 	}
 
 	return NULL;