Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

[linux-2.6-omap-h63xx.git] / drivers / macintosh / therm_pm72.c

diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index cc507ceef15388175917ef3852c504731dd66c24..3fc8cdd94c3daa9b4154b8d721b381bb0eb09797 100644 (file)
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -1678,10 +1678,9 @@ static int main_control_loop(void *x)
                }
 
                // FIXME: Deal with signals
-               set_current_state(TASK_INTERRUPTIBLE);
                elapsed = jiffies - start;
                if (elapsed < HZ)
-                       schedule_timeout(HZ - elapsed);
+                       schedule_timeout_interruptible(HZ - elapsed);
        }
 
  out: