Skip to content

Commit

Permalink
[PATCH] um: fix confusion irq early reenabling
Browse files Browse the repository at this point in the history
Fix confusion about call context - comments and code are inconsistent and
plain wrong, my fault.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Mar 8, 2007
1 parent b533788 commit ec0ac8a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/um/drivers/line.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,18 +370,18 @@ 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;
} else if(err < 0) {
line->head = line->buffer;
line->tail = line->buffer;
}
spin_unlock_irq(&line->lock);
spin_unlock(&line->lock);

if(tty == NULL)
return IRQ_NONE;
Expand Down

0 comments on commit ec0ac8a

Please sign in to comment.