---

yaml --- r: 333593 b: refs/heads/master c: 80d81d6 h: refs/heads/master i: 333591: c61e5c7 v: v3
git-mirror · Sep 26, 2012 · de22c3a · de22c3a
1 parent 0a64b3c
commit de22c3a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 947b2254249ceab769dfa07d5291fd77e387a0c7
+refs/heads/master: 80d81d64d6272a622ee6c9d0de871507daa52c89
diff --git a/trunk/drivers/video/omap2/dss/manager.c b/trunk/drivers/video/omap2/dss/manager.c
@@ -38,7 +38,7 @@ static struct omap_overlay_manager *managers;
 
 static inline struct omap_dss_device *dss_mgr_get_device(struct omap_overlay_manager *mgr)
 {
-	return mgr->device;
+	return mgr->output ? mgr->output->device : NULL;
 }
 
 static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)

diff --git a/trunk/drivers/video/omap2/dss/overlay.c b/trunk/drivers/video/omap2/dss/overlay.c
@@ -40,7 +40,9 @@ static struct omap_overlay *overlays;
 
 static inline struct omap_dss_device *dss_ovl_get_device(struct omap_overlay *ovl)
 {
-	return ovl->manager ? ovl->manager->device : NULL;
+	return ovl->manager ?
+		(ovl->manager->output ? ovl->manager->output->device : NULL) :
+		NULL;
 }
 
 int omap_dss_get_num_overlays(void)