sparc: serial: sunhv: fix a double lock bug

We accidentally take the "port->lock" twice in a row. This old code was supposed to be deleted. Fixes: e58e241 ('sparc: serial: Clean up the locking for -rt') Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
redbrain17 · Jul 28, 2016 · 344e3c7 · 344e3c7
1 parent fa16082
commit 344e3c7
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
@@ -490,12 +490,6 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig
 		locked = spin_trylock_irqsave(&port->lock, flags);
 	else
 		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++) {
 		if (*s == '\n')