From: Stelian Pop <stelian@popies.net>
Date: Tue, 8 May 2007 15:22:02 +0000 (+0200)
Subject: hwmon/ams: Fix I2C read retry logic
X-Git-Tag: v2.6.22-rc1~351^2~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=63232dcd555d60d70ce8e09b53c8ef8e4a49a3f9;p=linux-2.6-block.git

hwmon/ams: Fix I2C read retry logic

Fix sleep and retry logic in ams-i2c.

Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---

diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c
index 485d333bcb3e..5c70f2e3022e 100644
--- a/drivers/hwmon/ams/ams-i2c.c
+++ b/drivers/hwmon/ams/ams-i2c.c
@@ -85,17 +85,17 @@ static int ams_i2c_write(u8 reg, u8 value)
 static int ams_i2c_cmd(enum ams_i2c_cmd cmd)
 {
 	s32 result;
-	int remaining = HZ / 20;
+	int count = 3;
 
 	ams_i2c_write(AMS_COMMAND, cmd);
-	mdelay(5);
+	msleep(5);
 
-	while (remaining) {
+	while (count--) {
 		result = ams_i2c_read(AMS_COMMAND);
 		if (result == 0 || result & 0x80)
 			return 0;
 
-		remaining = schedule_timeout(remaining);
+		schedule_timeout_uninterruptible(HZ / 20);
 	}
 
 	return -1;