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

Commit 174f1307 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

[PATCH] Char: isicom, fix locking in isr 



2 spin_unlocks are omitted in the interrupt handler.  Put them there to fix up
deadlocking on UP.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 02d3fca0

drivers/char/isicom.c

+2 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id) 
	port = card->ports + channel;

	if (!(port->flags & ASYNC_INITIALIZED)) {

		outw(0x0000, base+0x04); /* enable interrupts */

		spin_unlock(&card->card_lock);

		return IRQ_HANDLED;

	}
@@ -678,6 +679,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id) 
		tty_flip_buffer_push(tty);

	}

	outw(0x0000, base+0x04); /* enable interrupts */

	spin_unlock(&card->card_lock);



	return IRQ_HANDLED;

}