diff options
| author | Erwan Le Ray <erwan.leray@foss.st.com> | 2021-01-21 15:23:09 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-26 19:21:49 +0100 |
| commit | e0f2a902c9f02fcb36c22f63e0db67e73375c843 (patch) | |
| tree | 0c1abf5d732d96e8b2f40029de05ce8049b1490d /drivers/tty | |
| parent | e9103f47bf1a1bbf0ab0ea90eda3e208653a5f57 (diff) | |
| download | linux-stable-e0f2a902c9f02fcb36c22f63e0db67e73375c843.tar.gz linux-stable-e0f2a902c9f02fcb36c22f63e0db67e73375c843.tar.bz2 linux-stable-e0f2a902c9f02fcb36c22f63e0db67e73375c843.zip | |
serial: stm32: improve platform_get_irq condition handling in init_port
Replace "ret" variable by "irq" variable from platform_get_irq condition
handling in stm32_init_port as suggested by Jiri in "STM32 uart cleanup and
improvement" series review.
This change will prevent port->irq to be unexpectly modified by a potential
change of "ret" value introduced by a new patch.
Suggested-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Erwan Le Ray <erwan.leray@foss.st.com>
Link: https://lore.kernel.org/r/20210121142309.6327-1-erwan.leray@foss.st.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/stm32-usart.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index 6a9a5ef5f5ba..dde6d526362d 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -981,11 +981,11 @@ static int stm32_usart_init_port(struct stm32_port *stm32port, { struct uart_port *port = &stm32port->port; struct resource *res; - int ret; + int ret, irq; - ret = platform_get_irq(pdev, 0); - if (ret <= 0) - return ret ? : -ENODEV; + irq = platform_get_irq(pdev, 0); + if (irq <= 0) + return irq ? : -ENODEV; port->iotype = UPIO_MEM; port->flags = UPF_BOOT_AUTOCONF; @@ -993,7 +993,7 @@ static int stm32_usart_init_port(struct stm32_port *stm32port, port->dev = &pdev->dev; port->fifosize = stm32port->info->cfg.fifosize; port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_STM32_CONSOLE); - port->irq = ret; + port->irq = irq; port->rs485_config = stm32_usart_config_rs485; ret = stm32_usart_init_rs485(port, pdev); |