2 files changed, 4 insertions, 7 deletions

diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c
index dbe6a32c064e..6db973739725 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;
 }
 
diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c
index ccd5cefae90e..957760536a4c 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;