diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 15:55:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 15:55:33 -0700 |
| commit | 9401c705f2a6a7e5df102f6443dba395c3c5e5a8 (patch) | |
| tree | 19bf660a776995b01c29228604824bb9823e24f3 /drivers | |
| parent | 61b22e693ea33af02f3380d3dbed9ee65a80c729 (diff) | |
| parent | 074c5279ef671e4fcd2ce2960ecc9d7d9735fabd (diff) | |
| download | linux-9401c705f2a6a7e5df102f6443dba395c3c5e5a8.tar.gz linux-9401c705f2a6a7e5df102f6443dba395c3c5e5a8.tar.bz2 linux-9401c705f2a6a7e5df102f6443dba395c3c5e5a8.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/sbus/char/bpp.c | 3 | ||||
| -rw-r--r-- | drivers/sbus/char/vfc_i2c.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c index 87302fb14885..ccb20a6f5f36 100644 --- 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) { - 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, diff --git a/drivers/sbus/char/vfc_i2c.c b/drivers/sbus/char/vfc_i2c.c index 739cad9b19a1..ceec30648f4f 100644 --- a/drivers/sbus/char/vfc_i2c.c +++ b/drivers/sbus/char/vfc_i2c.c @@ -81,8 +81,7 @@ int vfc_pcf8584_init(struct vfc_dev *dev) void vfc_i2c_delay_no_busy(struct vfc_dev *dev, unsigned long usecs) { - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(usecs_to_jiffies(usecs)); + schedule_timeout_uninterruptible(usecs_to_jiffies(usecs)); } void inline vfc_i2c_delay(struct vfc_dev *dev) |