Commit b6fd2dbb authored Apr 03, 2020 by Michal Simek Committed by Greg Kroah-Hartman Apr 16, 2020

Revert "serial: uartps: Fix error path when alloc failed"

This reverts commit 32cf21ac.

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>

parent 8da1a394

drivers/tty/serial/xilinx_uartps.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1542,10 +1542,8 @@ 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) {
		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));

Admin message