Commit cfac7aaa authored by Dan Carpenter's avatar Dan Carpenter Committed by Ben Hutchings

sparc: serial: sunhv: fix a double lock bug

commit 344e3c77 upstream.

We accidentally take the "port->lock" twice in a row.  This old code
was supposed to be deleted.

Fixes: e58e241c ('sparc: serial: Clean up the locking for -rt')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 7166a28b
...@@ -492,12 +492,6 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig ...@@ -492,12 +492,6 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig
locked = spin_trylock_irqsave(&port->lock, flags); locked = spin_trylock_irqsave(&port->lock, flags);
else else
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
if (port->sysrq) {
locked = 0;
} else if (oops_in_progress) {
locked = spin_trylock(&port->lock);
} else
spin_lock(&port->lock);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (*s == '\n') if (*s == '\n')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment