* [patch -old] sparc: serial: sunhv: fix a double lock bug
@ 2016-07-15 11:17 Dan Carpenter
2016-07-28 5:55 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2016-07-15 11:17 UTC (permalink / raw)
To: David S. Miller
Cc: Greg Kroah-Hartman, Jiri Slaby, sparclinux, linux-serial,
kernel-janitors
We accidentally take the "port->lock" twice in a row. This old code
was supposed to be deleted.
Fixes: e58e241c1788 ('sparc: serial: Clean up the locking for -rt')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index ca0d380..4e603d0 100644
--- 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')
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch -old] sparc: serial: sunhv: fix a double lock bug
2016-07-15 11:17 [patch -old] sparc: serial: sunhv: fix a double lock bug Dan Carpenter
@ 2016-07-28 5:55 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-07-28 5:55 UTC (permalink / raw)
To: dan.carpenter; +Cc: gregkh, jslaby, sparclinux, linux-serial, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 15 Jul 2016 14:17:33 +0300
> We accidentally take the "port->lock" twice in a row. This old code
> was supposed to be deleted.
>
> Fixes: e58e241c1788 ('sparc: serial: Clean up the locking for -rt')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied and queued up for -stable, thanks Dan.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-28 5:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-15 11:17 [patch -old] sparc: serial: sunhv: fix a double lock bug Dan Carpenter
2016-07-28 5:55 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).