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

Commit ec0ac8ad authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] um: fix confusion irq early reenabling 



Fix confusion about call context - comments and code are inconsistent and
plain wrong, my fault.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b5337885

arch/um/drivers/line.c

+3 −3
Original line number Diff line number Diff line
@@ -370,10 +370,10 @@ static irqreturn_t line_write_interrupt(int irq, void *data) 
	struct tty_struct *tty = line->tty;

	int err;



	/* Interrupts are enabled here because we registered the interrupt with

	/* Interrupts are disabled here because we registered the interrupt with

	 * IRQF_DISABLED (see line_setup_irq).*/



	spin_lock_irq(&line->lock);

	spin_lock(&line->lock);

	err = flush_buffer(line);

	if (err == 0) {

		return IRQ_NONE;
@@ -381,7 +381,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data) 
		line->head = line->buffer;

		line->tail = line->buffer;

	}

	spin_unlock_irq(&line->lock);

	spin_unlock(&line->lock);



	if(tty == NULL)

		return IRQ_NONE;