git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
macintosh
/
adb.c
diff --git
a/drivers/macintosh/adb.c
b/drivers/macintosh/adb.c
index
b7cc2da
..
3d2357e
100644
(file)
--- a/
drivers/macintosh/adb.c
+++ b/
drivers/macintosh/adb.c
@@
-139,9
+139,10
@@
static void printADBreply(struct adb_request *req)
static __inline__ void adb_wait_ms(unsigned int ms)
{
if (current->pid && adb_probe_task_pid &&
static __inline__ void adb_wait_ms(unsigned int ms)
{
if (current->pid && adb_probe_task_pid &&
- adb_probe_task_pid == current->pid)
- msleep(ms);
- else
+ adb_probe_task_pid == current->pid) {
+ set_task_state(current, TASK_UNINTERRUPTIBLE);
+ schedule_timeout(1 + ms * HZ / 1000);
+ } else
mdelay(ms);
}
mdelay(ms);
}
@@
-560,7
+561,7
@@
adb_unregister(int index)
write_lock_irq(&adb_handler_lock);
}
ret = 0;
write_lock_irq(&adb_handler_lock);
}
ret = 0;
- adb_handler[index].handler =
NULL
;
+ adb_handler[index].handler =
0
;
}
write_unlock_irq(&adb_handler_lock);
up(&adb_handler_sem);
}
write_unlock_irq(&adb_handler_lock);
up(&adb_handler_sem);