projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[powerpc.git]
/
drivers
/
sbus
/
char
/
bpp.c
diff --git
a/drivers/sbus/char/bpp.c
b/drivers/sbus/char/bpp.c
index
87302fb
..
ccb20a6
100644
(file)
--- a/
drivers/sbus/char/bpp.c
+++ b/
drivers/sbus/char/bpp.c
@@
-295,8
+295,7
@@
static unsigned short get_pins(unsigned minor)
static void snooze(unsigned long snooze_time, unsigned minor)
{
static void snooze(unsigned long snooze_time, unsigned minor)
{
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(snooze_time + 1);
+ schedule_timeout_uninterruptible(snooze_time + 1);
}
static int wait_for(unsigned short set, unsigned short clr,
}
static int wait_for(unsigned short set, unsigned short clr,