---

yaml --- r: 142013 b: refs/heads/master c: f3df0b7 h: refs/heads/master i: 142011: 234c79d v: v3
git-mirror · Apr 4, 2009 · 6fd9313 · 6fd9313
1 parent 8f75ae7
commit 6fd9313
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);