Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc

[cascardo/linux.git] / drivers / video / sh_mobile_meram.c

diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c
index f632970..4d63490 100644 (file)
--- a/drivers/video/sh_mobile_meram.c
+++ b/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;
 }