diff options
| author |   Borut Seljak <borut.seljak@t-2.net> | 2019-06-07 12:53:06 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-10 19:12:10 +0200 |
| commit | 707aeea13a9c85520262e11899d86df3c4b48262 (patch) | |
| tree | dda848bd27a4dd21d4387b7f2ec2737853991864 /drivers/tty/serial | |
| parent | tty: serial: 8250-of: Do not warn on deferred probe (diff) | |
| download | linux-dev-707aeea13a9c85520262e11899d86df3c4b48262.tar.xz linux-dev-707aeea13a9c85520262e11899d86df3c4b48262.zip | |
serial: stm32: fix a recursive locking in stm32_config_rs485
Remove spin_lock_irqsave in stm32_config_rs485, it cause recursive locking.
Already locked in uart_set_rs485_config.
Fixes: 1bcda09d291081 ("serial: stm32: add support for RS485 hardware control mode")
Signed-off-by: Borut Seljak <borut.seljak@t-2.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/stm32-usart.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index 4c217fb35bcb..7a46d7ba967e 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -105,9 +105,7 @@ static int stm32_config_rs485(struct uart_port *port, struct stm32_usart_config *cfg = &stm32_port->info->cfg; u32 usartdiv, baud, cr1, cr3; bool over8; - unsigned long flags; - spin_lock_irqsave(&port->lock, flags); stm32_clr_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit)); port->rs485 = *rs485conf; @@ -147,7 +145,6 @@ static int stm32_config_rs485(struct uart_port *port, } stm32_set_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit)); - spin_unlock_irqrestore(&port->lock, flags); return 0; } |