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

[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
...@@ -370,10 +370,10 @@ static irqreturn_t line_write_interrupt(int irq, void *data) ...@@ -370,10 +370,10 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
struct tty_struct *tty = line->tty; struct tty_struct *tty = line->tty;
int err; 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).*/ * IRQF_DISABLED (see line_setup_irq).*/
spin_lock_irq(&line->lock); spin_lock(&line->lock);
err = flush_buffer(line); err = flush_buffer(line);
if (err == 0) { if (err == 0) {
return IRQ_NONE; return IRQ_NONE;
...@@ -381,7 +381,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data) ...@@ -381,7 +381,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
line->head = line->buffer; line->head = line->buffer;
line->tail = line->buffer; line->tail = line->buffer;
} }
spin_unlock_irq(&line->lock); spin_unlock(&line->lock);
if(tty == NULL) if(tty == NULL)
return IRQ_NONE; return IRQ_NONE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment