diff options
author | Stelian Pop <stelian@popies.net> | 2007-05-08 11:22:02 -0400 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2007-05-08 11:22:02 -0400 |
commit | 63232dcd555d60d70ce8e09b53c8ef8e4a49a3f9 (patch) | |
tree | 75ee7e9fb6cc8e18ad129cbea8fdfba467c21251 /drivers/hwmon/ams | |
parent | 2d8dd65fc14287f2c004dd755e517ba0f45d446e (diff) |
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>
Diffstat (limited to 'drivers/hwmon/ams')
-rw-r--r-- | drivers/hwmon/ams/ams-i2c.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) | |||
85 | static int ams_i2c_cmd(enum ams_i2c_cmd cmd) | 85 | static int ams_i2c_cmd(enum ams_i2c_cmd cmd) |
86 | { | 86 | { |
87 | s32 result; | 87 | s32 result; |
88 | int remaining = HZ / 20; | 88 | int count = 3; |
89 | 89 | ||
90 | ams_i2c_write(AMS_COMMAND, cmd); | 90 | ams_i2c_write(AMS_COMMAND, cmd); |
91 | mdelay(5); | 91 | msleep(5); |
92 | 92 | ||
93 | while (remaining) { | 93 | while (count--) { |
94 | result = ams_i2c_read(AMS_COMMAND); | 94 | result = ams_i2c_read(AMS_COMMAND); |
95 | if (result == 0 || result & 0x80) | 95 | if (result == 0 || result & 0x80) |
96 | return 0; | 96 | return 0; |
97 | 97 | ||
98 | remaining = schedule_timeout(remaining); | 98 | schedule_timeout_uninterruptible(HZ / 20); |
99 | } | 99 | } |
100 | 100 | ||
101 | return -1; | 101 | return -1; |