vserver 1.9.3

[linux-2.6.git] / drivers / i2c / busses / i2c-keywest.c

diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index 0b606e8..a5a8c1e 100644 (file)
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -88,12 +88,12 @@ static const char *__kw_state_names[] = {
 };
 #endif /* DEBUG */
 
+static int probe;
+
 MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
 MODULE_DESCRIPTION("I2C driver for Apple's Keywest");
 MODULE_LICENSE("GPL");
-MODULE_PARM(probe, "i");
-
-static int probe = 0;
+module_param(probe, bool, 0);
 
 #ifdef POLLED_MODE
 /* Don't schedule, the g5 fan controller is too
@@ -662,8 +662,7 @@ dispose_iface(struct device *dev)
        spin_lock_irq(&iface->lock);
        while (iface->state != state_idle) {
                spin_unlock_irq(&iface->lock);
-               set_task_state(current,TASK_UNINTERRUPTIBLE);
-               schedule_timeout(HZ/10);
+               msleep(100);
                spin_lock_irq(&iface->lock);
        }
 #endif /* POLLED_MODE */