serial: uartps: Fix error path when alloc failed
authorMichal Simek <michal.simek@xilinx.com>
Tue, 18 Dec 2018 12:18:41 +0000 (13:18 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Dec 2018 07:23:20 +0000 (08:23 +0100)
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>
drivers/tty/serial/xilinx_uartps.c

index 9cdc36be5b13084bfb0a36904fe69f186f96aa5b..c6d38617d6222ecf787f335307dc3adbf57a1a14 100644 (file)
@@ -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));