From 6fd9313120a197f5091bc342e26caaa98f08fc8d Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 1 Mar 2009 20:11:58 +0100
Subject: [PATCH] --- yaml --- r: 142013 b: refs/heads/master c:
 f3df0b7533ccad7bb3ef25383fea9c990b0033a2 h: refs/heads/master i:   142011:
 234c79d3ac17bd3b970836fae2fec668f5b029e4 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/wm8350-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 54a5d473510e..0f28b5c884f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3446d4bb93b4d8c7c5b667dd0271669f012fb166
+refs/heads/master: f3df0b7533ccad7bb3ef25383fea9c990b0033a2
diff --git a/trunk/drivers/mfd/wm8350-core.c b/trunk/drivers/mfd/wm8350-core.c
index a285cc0cc704..c2be3088e2e1 100644
--- a/trunk/drivers/mfd/wm8350-core.c
+++ b/trunk/drivers/mfd/wm8350-core.c
@@ -1111,7 +1111,7 @@ int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale, int vref)
 	do {
 		schedule_timeout_interruptible(1);
 		reg = wm8350_reg_read(wm8350, WM8350_DIGITISER_CONTROL_1);
-	} while (--tries && (reg & WM8350_AUXADC_POLL));
+	} while ((reg & WM8350_AUXADC_POLL) && --tries);
 
 	if (!tries)
 		dev_err(wm8350->dev, "adc chn %d read timeout\n", channel);