diff --git a/[refs] b/[refs]
index fb1ff22f2506..2ee91cf27ee9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e8718a1f960db0c48427f4583f89f4cb62f2480
+refs/heads/master: bc34496d63ec0a669d6825ea42275fd6fcbe9969
diff --git a/trunk/drivers/input/mouse/pxa930_trkball.c b/trunk/drivers/input/mouse/pxa930_trkball.c
index a0f45c4fc198..784be69b7112 100644
--- a/trunk/drivers/input/mouse/pxa930_trkball.c
+++ b/trunk/drivers/input/mouse/pxa930_trkball.c
@@ -83,7 +83,7 @@ static int write_tbcr(struct pxa930_trkball *trkball, int v)
 
 	__raw_writel(v, trkball->mmio_base + TBCR);
 
-	while (i--) {
+	while (--i) {
 		if (__raw_readl(trkball->mmio_base + TBCR) == v)
 			break;
 		msleep(1);