diff options
author | Dan Carpenter <error27@gmail.com> | 2010-04-06 17:34:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 11:38:03 -0400 |
commit | c6eb69acfdfe258b4a3f69fa5ced8928bbebdba9 (patch) | |
tree | 8b75d0832f9eb7abdb0ba708ad08ad180ec61759 /drivers/char | |
parent | cdeebaddb7f97298c73df4d43d31e164fc8aa0e4 (diff) |
mxser: spin_lock() => spin_lock_irq()
This should be spin_lock_irq() to match the spin_unlock_irq(). Originally
it was a lock_kernel() but we switched everything to spin_lock_irq() last
November.
[akpm@linux-foundation.org: fix the MOXA_ASPP_MON case too (per Jiri)]
Signed-off-by: Dan Carpenter <error27@gmail.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/mxser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 95c9f54f3d30..47023053ee85 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
@@ -1768,7 +1768,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, | |||
1768 | int len, lsr; | 1768 | int len, lsr; |
1769 | 1769 | ||
1770 | len = mxser_chars_in_buffer(tty); | 1770 | len = mxser_chars_in_buffer(tty); |
1771 | spin_lock(&info->slock); | 1771 | spin_lock_irq(&info->slock); |
1772 | lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_THRE; | 1772 | lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_THRE; |
1773 | spin_unlock_irq(&info->slock); | 1773 | spin_unlock_irq(&info->slock); |
1774 | len += (lsr ? 0 : 1); | 1774 | len += (lsr ? 0 : 1); |
@@ -1778,12 +1778,12 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, | |||
1778 | case MOXA_ASPP_MON: { | 1778 | case MOXA_ASPP_MON: { |
1779 | int mcr, status; | 1779 | int mcr, status; |
1780 | 1780 | ||
1781 | spin_lock(&info->slock); | 1781 | spin_lock_irq(&info->slock); |
1782 | status = mxser_get_msr(info->ioaddr, 1, tty->index); | 1782 | status = mxser_get_msr(info->ioaddr, 1, tty->index); |
1783 | mxser_check_modem_status(tty, info, status); | 1783 | mxser_check_modem_status(tty, info, status); |
1784 | 1784 | ||
1785 | mcr = inb(info->ioaddr + UART_MCR); | 1785 | mcr = inb(info->ioaddr + UART_MCR); |
1786 | spin_unlock(&info->slock); | 1786 | spin_unlock_irq(&info->slock); |
1787 | 1787 | ||
1788 | if (mcr & MOXA_MUST_MCR_XON_FLAG) | 1788 | if (mcr & MOXA_MUST_MCR_XON_FLAG) |
1789 | info->mon_data.hold_reason &= ~NPPI_NOTIFY_XOFFHOLD; | 1789 | info->mon_data.hold_reason &= ~NPPI_NOTIFY_XOFFHOLD; |