From 63232dcd555d60d70ce8e09b53c8ef8e4a49a3f9 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Tue, 8 May 2007 17:22:02 +0200 Subject: hwmon/ams: Fix I2C read retry logic Fix sleep and retry logic in ams-i2c. Signed-off-by: Stelian Pop Signed-off-by: Jean Delvare --- drivers/hwmon/ams/ams-i2c.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/hwmon/ams') diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c index 485d333..5c70f2e 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; -- cgit v1.1 From 47a5dba1dca723d890d0b9409c82e72311a1f641 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 May 2007 17:22:02 +0200 Subject: hwmon/ams: Do not print error on systems without apple motion sensor It is not an error if a system has no ams hardware. Do not clutter dmesg in this case. Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Acked-by: Michael Hanselmann Signed-off-by: Jean Delvare --- drivers/hwmon/ams/ams-core.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/hwmon/ams') diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c index f5ebad5..e0098a3 100644 --- a/drivers/hwmon/ams/ams-core.c +++ b/drivers/hwmon/ams/ams-core.c @@ -219,9 +219,6 @@ int __init ams_init(void) /* Found PMU motion sensor */ return ams_pmu_init(np); #endif - - printk(KERN_ERR "ams: No motion sensor found.\n"); - return -ENODEV; } -- cgit v1.1