---

yaml --- r: 333594 b: refs/heads/master c: 0f0e4e3 h: refs/heads/master v: v3
git-mirror · Sep 26, 2012 · bacbddb · bacbddb
1 parent de22c3a
commit bacbddb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80d81d64d6272a622ee6c9d0de871507daa52c89
+refs/heads/master: 0f0e4e3cd8030c3056e8f43196a112e887a545f9
diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c
@@ -1464,7 +1464,7 @@ int dss_ovl_enable(struct omap_overlay *ovl)
 		goto err1;
 	}
 
-	if (ovl->get_device(ovl) == NULL) {
+	if (ovl->manager == NULL || ovl->manager->output == NULL) {
 		r = -EINVAL;
 		goto err1;
 	}
@@ -1514,7 +1514,7 @@ int dss_ovl_disable(struct omap_overlay *ovl)
 		goto err;
 	}
 
-	if (ovl->get_device(ovl) == NULL) {
+	if (ovl->manager == NULL || ovl->manager->output == NULL) {
 		r = -EINVAL;
 		goto err;
 	}