From: Jiri Slaby Date: Fri, 8 Dec 2006 10:38:18 +0000 (-0800) Subject: [PATCH] Char: mxser_new, revert spin_lock changes X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eba529ecf76fcea5f82ceaf803b030d5e0ce71f7;p=linux-beck.git [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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)