diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/macintosh/therm_pm72.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/macintosh/therm_pm72.c')
| -rw-r--r-- | drivers/macintosh/therm_pm72.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index cc507ceef15..3fc8cdd94c3 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
| @@ -1678,10 +1678,9 @@ static int main_control_loop(void *x) | |||
| 1678 | } | 1678 | } |
| 1679 | 1679 | ||
| 1680 | // FIXME: Deal with signals | 1680 | // FIXME: Deal with signals |
| 1681 | set_current_state(TASK_INTERRUPTIBLE); | ||
| 1682 | elapsed = jiffies - start; | 1681 | elapsed = jiffies - start; |
| 1683 | if (elapsed < HZ) | 1682 | if (elapsed < HZ) |
| 1684 | schedule_timeout(HZ - elapsed); | 1683 | schedule_timeout_interruptible(HZ - elapsed); |
| 1685 | } | 1684 | } |
| 1686 | 1685 | ||
| 1687 | out: | 1686 | out: |