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
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
sbus
/
char
/
bbc_i2c.c
diff --git
a/drivers/sbus/char/bbc_i2c.c
b/drivers/sbus/char/bbc_i2c.c
index
a489c54
..
2dcd3cd
100644
(file)
--- a/
drivers/sbus/char/bbc_i2c.c
+++ b/
drivers/sbus/char/bbc_i2c.c
@@
-189,13
+189,13
@@
static int wait_for_pin(struct bbc_i2c_bus *bp, u8 *status)
while (limit-- > 0) {
u8 val;
while (limit-- > 0) {
u8 val;
-
current->state = TASK_INTERRUPTIBLE
;
+
set_current_state(TASK_INTERRUPTIBLE)
;
*status = val = readb(bp->i2c_control_regs + 0);
if ((val & I2C_PCF_PIN) == 0) {
ret = 0;
break;
}
*status = val = readb(bp->i2c_control_regs + 0);
if ((val & I2C_PCF_PIN) == 0) {
ret = 0;
break;
}
-
schedule_timeout(HZ/4
);
+
msleep_interruptible(250
);
}
remove_wait_queue(&bp->wq, &wait);
bp->waiting = 0;
}
remove_wait_queue(&bp->wq, &wait);
bp->waiting = 0;