From: David S. Miller <davem@davemloft.net>
Date: Wed, 21 May 2008 06:42:09 +0000 (-0700)
Subject: sunhv: Fix locking in non-paged I/O case.
X-Git-Tag: v2.6.26-rc4~71^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3651751fff44ede58f65cbb1e39242139ead251b;p=linux-2.6-omap-h63xx.git

sunhv: Fix locking in non-paged I/O case.

This causes the lock to be taken twice, thus resulting in
a deadlock.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 145c0281495..2847336742d 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -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');