Skip to content

Commit

Permalink
[PATCH] Char: mxser_new, revert spin_lock changes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent 06cc86b commit eba529e
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions drivers/char/mxser_new.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit eba529e

Please sign in to comment.