From cb1efb73fdf72312dba9b7bd747749ac3f50838b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 19 Sep 2011 11:40:31 +0200 Subject: [PATCH] --- yaml --- r: 294264 b: refs/heads/master c: eb4f2304ba029f78516c2fe23213d7e2d0f8d58f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/sh_mobile_meram.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f56143dc74e4..a99031949227 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05432837ae0dfc6c7de93d081b1377ced4eb866b +refs/heads/master: eb4f2304ba029f78516c2fe23213d7e2d0f8d58f diff --git a/trunk/drivers/video/sh_mobile_meram.c b/trunk/drivers/video/sh_mobile_meram.c index 548f70096124..7af2ffe475d4 100644 --- a/trunk/drivers/video/sh_mobile_meram.c +++ b/trunk/drivers/video/sh_mobile_meram.c @@ -259,8 +259,8 @@ static inline void meram_set_next_addr(struct sh_mobile_meram_priv *priv, { unsigned long target; - target = (cfg->current_reg) ? MExxSARA : MExxSARB; cfg->current_reg ^= 1; + target = cfg->current_reg ? MExxSARB : MExxSARA; /* set the next address to fetch */ meram_write_icb(priv->base, cfg->icb[0].cache_icb, target,