| From b6fd2dbbd649b89a3998528994665ded1e3fbf7f Mon Sep 17 00:00:00 2001 |
| From: Michal Simek <michal.simek@xilinx.com> |
| Date: Fri, 3 Apr 2020 11:24:32 +0200 |
| Subject: Revert "serial: uartps: Fix error path when alloc failed" |
| |
| From: Michal Simek <michal.simek@xilinx.com> |
| |
| commit b6fd2dbbd649b89a3998528994665ded1e3fbf7f upstream. |
| |
| This reverts commit 32cf21ac4edd6c0d5b9614368a83bcdc68acb031. |
| |
| As Johan says, this driver needs a lot more work and these changes are |
| only going in the wrong direction: |
| https://lkml.kernel.org/r/20190523091839.GC568@localhost |
| |
| Reported-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Michal Simek <michal.simek@xilinx.com> |
| Cc: stable <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/46cd7f039db847c08baa6508edd7854f7c8ff80f.1585905873.git.michal.simek@xilinx.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/tty/serial/xilinx_uartps.c | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/tty/serial/xilinx_uartps.c |
| +++ b/drivers/tty/serial/xilinx_uartps.c |
| @@ -1528,10 +1528,8 @@ static int cdns_uart_probe(struct platfo |
| #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE |
| cdns_uart_console = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_console), |
| GFP_KERNEL); |
| - if (!cdns_uart_console) { |
| - rc = -ENOMEM; |
| - goto err_out_id; |
| - } |
| + if (!cdns_uart_console) |
| + return -ENOMEM; |
| |
| strncpy(cdns_uart_console->name, CDNS_UART_TTY_NAME, |
| sizeof(cdns_uart_console->name)); |
