diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-07-15 13:17:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-28 07:54:52 +0200 |
| commit | 344e3c7734d5090b148c19ac6539b8947fed6767 (patch) | |
| tree | dc8cd272ecad03976dd5e317d3271fc6529a5bd1 /drivers/tty/serial/sunhv.c | |
| parent | sparc32: off by ones in BUG_ON() (diff) | |
| download | linux-344e3c7734d5090b148c19ac6539b8947fed6767.tar.xz linux-344e3c7734d5090b148c19ac6539b8947fed6767.zip | |
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: e58e241c1788 ('sparc: serial: Clean up the locking for -rt')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/tty/serial/sunhv.c')
| -rw-r--r-- | drivers/tty/serial/sunhv.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c index ca0d3802f2af..4e603d060e80 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') |