---

yaml --- r: 271303 b: refs/heads/master c: da6cf51 h: refs/heads/master i: 271301: f4cc808 271299: b5f9368 271295: ce27f1e v: v3
git-mirror · Sep 5, 2011 · cd1c844 · cd1c844
1 parent 924facf
commit cd1c844
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c8a63e22a0802fd56380f6ab305b419f18eb6f5
+refs/heads/master: da6cf5125f66ed1810616937777884cea021e66a
diff --git a/trunk/drivers/video/sh_mobile_meram.c b/trunk/drivers/video/sh_mobile_meram.c
@@ -373,8 +373,10 @@ static void meram_deinit(struct sh_mobile_meram_priv *priv,
 			struct sh_mobile_meram_icb *icb)
 {
 	/* disable ICB */
-	meram_write_icb(priv->base, icb->cache_icb,  MExxCTL, 0);
-	meram_write_icb(priv->base, icb->marker_icb, MExxCTL, 0);
+	meram_write_icb(priv->base, icb->cache_icb,  MExxCTL,
+			MExxCTL_WBF | MExxCTL_WF | MExxCTL_RF);
+	meram_write_icb(priv->base, icb->marker_icb, MExxCTL,
+			MExxCTL_WBF | MExxCTL_WF | MExxCTL_RF);
 	icb->cache_unit = 0;
 }