diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-08 01:14:20 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-08 01:14:20 +0100 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/macintosh | |
| parent | Merge ../linux-2.6 (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-24bfb00123e82a2e70bd115277d922438813515b.tar.xz linux-24bfb00123e82a2e70bd115277d922438813515b.zip | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/adbhid.c | 3 | ||||
| -rw-r--r-- | drivers/macintosh/therm_pm72.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 8f02c155fdc0..c0b46bceb5df 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c @@ -857,8 +857,7 @@ adbhid_input_register(int id, int default_id, int original_handler_id, static void adbhid_input_unregister(int id) { input_unregister_device(adbhid[id]->input); - if (adbhid[id]->keycode) - kfree(adbhid[id]->keycode); + kfree(adbhid[id]->keycode); kfree(adbhid[id]); adbhid[id] = NULL; } diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index cc507ceef153..3fc8cdd94c3d 100644 --- 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: |