diff --git a/[refs] b/[refs] index ce509081328a..1137ea48800f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7963e21e50c8e712553347f900f0d0afaf5be2aa +refs/heads/master: d86d29df57adf9258f56939e59cdd70932845885 diff --git a/trunk/drivers/video/sh_mobile_meram.c b/trunk/drivers/video/sh_mobile_meram.c index 25a7118a40f8..7ba6dce459b2 100644 --- a/trunk/drivers/video/sh_mobile_meram.c +++ b/trunk/drivers/video/sh_mobile_meram.c @@ -549,7 +549,7 @@ static int sh_mobile_meram_runtime_suspend(struct device *dev) meram_read_icb(priv->base, j, icb_regs[k]); /* Reset ICB on resume */ if (icb_regs[k] == MExxCTL) - priv->icb_saved_regs[j * ICB_REGS_SIZE + k] = + priv->icb_saved_regs[j * ICB_REGS_SIZE + k] |= MExxCTL_WBF | MExxCTL_WF | MExxCTL_RF; } }