X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fserial%2Fsunhv.c;h=2847336742d77e4ef1ab7cf66980cb7f50393154;hb=77b96bd7e5ee0b44aed1b77fef5949bc19e8301f;hp=be0fe152891b762135ec1d72ff9a8cd200aea708;hpb=ac0b50dd10ac0d30f2732eec0587f3632c2be725;p=linux-2.6

diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index be0fe15289..2847336742 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -392,7 +392,7 @@ static struct uart_ops sunhv_pops = {
 
 static struct uart_driver sunhv_reg = {
 	.owner			= THIS_MODULE,
-	.driver_name		= "serial",
+	.driver_name		= "sunhv",
 	.dev_name		= "ttyS",
 	.major			= TTY_MAJOR,
 };
@@ -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');