diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2006-12-08 13:38:18 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 19:28:53 +0300 |
| commit | eba529ecf76fcea5f82ceaf803b030d5e0ce71f7 (patch) | |
| tree | 22612f049ff773aef27c2bcba687c97b1c8c0744 /drivers/char/mxser_new.c | |
| parent | 06cc86b5bd4edcf5e7d68624f7d5c9951916f3d1 (diff) | |
| download | linux-eba529ecf76fcea5f82ceaf803b030d5e0ce71f7.tar.xz | |
[PATCH] Char: mxser_new, revert spin_lock changes
Some spinlock changes were introduced in 1.9.1 original moxa driver. Revert
them, since they cause machine not responding.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/mxser_new.c')
| -rw-r--r-- | drivers/char/mxser_new.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c index 4ca97c4401d5..61c5594ac12b 100644 --- a/drivers/char/mxser_new.c +++ b/drivers/char/mxser_new.c @@ -1687,22 +1687,12 @@ static void mxser_startrx(struct tty_struct *tty) */ static void mxser_throttle(struct tty_struct *tty) { - struct mxser_port *info = tty->driver_data; - unsigned long flags; - - spin_lock_irqsave(&info->slock, flags); mxser_stoprx(tty); - spin_unlock_irqrestore(&info->slock, flags); } static void mxser_unthrottle(struct tty_struct *tty) { - struct mxser_port *info = tty->driver_data; - unsigned long flags; - - spin_lock_irqsave(&info->slock, flags); mxser_startrx(tty); - spin_unlock_irqrestore(&info->slock, flags); } static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termios) @@ -1930,7 +1920,6 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs) } /* above add by Victor Yu. 09-13-2002 */ - spin_lock(&port->slock); /* following add by Victor Yu. 09-02-2002 */ status = inb(port->ioaddr + UART_LSR); @@ -1981,7 +1970,6 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs) if (status & UART_LSR_THRE) mxser_transmit_chars(port); } - spin_unlock(&port->slock); } while (int_cnt++ < MXSER_ISR_PASS_LIMIT); } if (pass_counter++ > MXSER_ISR_PASS_LIMIT) |