Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6eb69ac authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds
Browse files

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: default avatarDan 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cdeebadd

drivers/char/mxser.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1768,7 +1768,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, 
		int len, lsr;

		int len, lsr;





		len = mxser_chars_in_buffer(tty);

		len = mxser_chars_in_buffer(tty);

		spin_lock(&info->slock);

		spin_lock_irq(&info->slock);

		lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_THRE;

		lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_THRE;

		spin_unlock_irq(&info->slock);

		spin_unlock_irq(&info->slock);

		len += (lsr ? 0 : 1);

		len += (lsr ? 0 : 1);
@@ -1778,12 +1778,12 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, 
	case MOXA_ASPP_MON: {

	case MOXA_ASPP_MON: {

		int mcr, status;

		int mcr, status;





		spin_lock(&info->slock);

		spin_lock_irq(&info->slock);

		status = mxser_get_msr(info->ioaddr, 1, tty->index);

		status = mxser_get_msr(info->ioaddr, 1, tty->index);

		mxser_check_modem_status(tty, info, status);

		mxser_check_modem_status(tty, info, status);





		mcr = inb(info->ioaddr + UART_MCR);

		mcr = inb(info->ioaddr + UART_MCR);

		spin_unlock(&info->slock);

		spin_unlock_irq(&info->slock);





		if (mcr & MOXA_MUST_MCR_XON_FLAG)

		if (mcr & MOXA_MUST_MCR_XON_FLAG)

			info->mon_data.hold_reason &= ~NPPI_NOTIFY_XOFFHOLD;

			info->mon_data.hold_reason &= ~NPPI_NOTIFY_XOFFHOLD;