]> err.no Git - linux-2.6/commitdiff
sunhv: Fix locking in non-paged I/O case.
authorDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2008 06:42:09 +0000 (23:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2008 06:42:09 +0000 (23:42 -0700)
This causes the lock to be taken twice, thus resulting in
a deadlock.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/serial/sunhv.c

index 145c0281495d81e1c7c214ed5f61847da0555d0d..2847336742d77e4ef1ab7cf66980cb7f50393154 100644 (file)
@@ -499,7 +499,6 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig
        } else
                spin_lock(&port->lock);
 
-       spin_lock_irqsave(&port->lock, flags);
        for (i = 0; i < n; i++) {
                if (*s == '\n')
                        sunhv_console_putchar(port, '\r');