diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2018-12-18 13:18:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-19 08:23:20 +0100 |
| commit | 32cf21ac4edd6c0d5b9614368a83bcdc68acb031 (patch) | |
| tree | 6b0d2ecb9dd9458c50ceab83b4501a6656bf7625 /drivers/tty | |
| parent | 82b1b2ec5d4057af11395ac03209884369418a0d (diff) | |
| download | linux-32cf21ac4edd6c0d5b9614368a83bcdc68acb031.tar.bz2 | |
serial: uartps: Fix error path when alloc failed
When cdns_uart_console allocation failed there is a need to also clear
ID from ID list.
Fixes: ae1cca3fa347 ("serial: uartps: Change uart ID port allocation")
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/xilinx_uartps.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index 9cdc36be5b13..c6d38617d622 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -1508,8 +1508,10 @@ static int cdns_uart_probe(struct platform_device *pdev) #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE cdns_uart_console = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_console), GFP_KERNEL); - if (!cdns_uart_console) - return -ENOMEM; + if (!cdns_uart_console) { + rc = -ENOMEM; + goto err_out_id; + } strncpy(cdns_uart_console->name, CDNS_UART_TTY_NAME, sizeof(cdns_uart_console->name)); |