---

yaml --- r: 284970 b: refs/heads/master c: 5af661c h: refs/heads/master v: v3
git-mirror · Jan 2, 2012 · 95c60cd · 95c60cd
1 parent 7d54cb7
commit 95c60cd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04576d415e01aa08752bf3884db9862cfbba9115
+refs/heads/master: 5af661ce1a8c7672364c2c911b76186589db0f0e
diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c
@@ -220,11 +220,9 @@ static int dss_mgr_check_zorder(struct omap_overlay_manager *mgr,
 		struct omap_overlay_info **overlay_infos)
 {
 	struct omap_overlay *ovl1, *ovl2;
-	struct ovl_priv_data *op1, *op2;
 	struct omap_overlay_info *info1, *info2;
 
 	list_for_each_entry(ovl1, &mgr->overlays, list) {
-		op1 = get_ovl_priv(ovl1);
 		info1 = overlay_infos[ovl1->id];
 
 		if (info1 == NULL)
@@ -234,7 +232,6 @@ static int dss_mgr_check_zorder(struct omap_overlay_manager *mgr,
 			if (ovl1 == ovl2)
 				continue;
 
-			op2 = get_ovl_priv(ovl2);
 			info2 = overlay_infos[ovl2->id];
 
 			if (info2 == NULL)