diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/sbus/char | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/sbus/char')
| -rw-r--r-- | drivers/sbus/char/bpp.c | 4 | ||||
| -rw-r--r-- | drivers/sbus/char/sab82532.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/su.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/vfc_i2c.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c index f445a14b2..0121a03e7 100644 --- a/drivers/sbus/char/bpp.c +++ b/drivers/sbus/char/bpp.c @@ -337,8 +337,8 @@ static int wait_for(unsigned short set, unsigned short clr, * responds real good. The first while loop guesses an expire * time accounting for possible wraparound of jiffies. */ - while (extime <= jiffies) extime = jiffies + 1; - while ( (jiffies < extime) + while (time_after_eq(jiffies, extime) extime = jiffies + 1; + while ( (time_before(jiffies, extime)) && (((pins & set) != set) || ((pins & clr) != 0)) ) { pins = get_pins(minor); } diff --git a/drivers/sbus/char/sab82532.c b/drivers/sbus/char/sab82532.c index 3f0924525..1ea317726 100644 --- a/drivers/sbus/char/sab82532.c +++ b/drivers/sbus/char/sab82532.c @@ -1676,7 +1676,7 @@ static void sab82532_wait_until_sent(struct tty_struct *tty, int timeout) schedule_timeout(char_time); if (signal_pending(current)) break; - if (timeout && (orig_jiffies + timeout) < jiffies) + if (timeout && time_after(jiffies, orig_jiffies + timeout)) break; } current->state = TASK_RUNNING; diff --git a/drivers/sbus/char/su.c b/drivers/sbus/char/su.c index b05acc314..b4ab6693f 100644 --- a/drivers/sbus/char/su.c +++ b/drivers/sbus/char/su.c @@ -1818,7 +1818,7 @@ su_wait_until_sent(struct tty_struct *tty, int timeout) schedule_timeout(char_time); if (signal_pending(current)) break; - if (timeout && ((orig_jiffies + timeout) < jiffies)) + if (timeout && time_after(jiffies, orig_jiffies + timeout)) break; } current->state = TASK_RUNNING; diff --git a/drivers/sbus/char/vfc_i2c.c b/drivers/sbus/char/vfc_i2c.c index 68cfc4405..8302316aa 100644 --- a/drivers/sbus/char/vfc_i2c.c +++ b/drivers/sbus/char/vfc_i2c.c @@ -156,7 +156,7 @@ int vfc_i2c_xmit_addr(struct vfc_dev *dev, unsigned char addr, char mode) switch(mode) { case VFC_I2C_READ: dev->regs->i2c_reg=raddr=SHIFT((unsigned int)addr | 0x1); - VFC_I2C_DEBUG_PRINTK(("vfc%d: recieving from i2c addr 0x%x\n", + VFC_I2C_DEBUG_PRINTK(("vfc%d: receiving from i2c addr 0x%x\n", dev->instance,addr | 0x1)); break; case VFC_I2C_WRITE: @@ -255,7 +255,7 @@ int vfc_i2c_recvbuf(struct vfc_dev *dev, unsigned char addr, if(!count) last=1; if((ret=vfc_i2c_recv_byte(dev,buf,last))) { printk(KERN_ERR "vfc%d: " - "VFC error while recieving byte\n", + "VFC error while receiving byte\n", dev->instance); dev->regs->i2c_s1=SEND_I2C_STOP; ret=-EINVAL; |