summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-06-09 13:49:22 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-06-16 13:19:52 -0700
commit53bb30ecca7c5fa33efd9bec02396a2f3d539183 (patch)
tree09c706dbdaaebb2858be5bb25d73af05695c8bbc
parentfdca786572904fdf11c489143781beec0024d5c5 (diff)
downloadlwn-53bb30ecca7c5fa33efd9bec02396a2f3d539183.tar.gz
lwn-53bb30ecca7c5fa33efd9bec02396a2f3d539183.zip
sunhv: Fix locking in non-paged I/O case.
[ upstream commit: 3651751fff44ede58f65cbb1e39242139ead251b ] This causes the lock to be taken twice, thus resulting in a deadlock. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-rw-r--r--drivers/serial/sunhv.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 145c0281495d..2847336742d7 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');