Commit 61ad2a02 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "serial-uartlite: Use allocated structure instead of static ones"

This reverts commit a00d9db8.

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: default avatarJohan Hovold <johan@kernel.org>
Cc: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19b6ecfc
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,
#endif

	/* Register the port */
	rc = uart_add_one_port(pdata->ulite_uart_driver, port);
	rc = uart_add_one_port(&ulite_uart_driver, port);
	if (rc) {
		dev_err(dev, "uart_add_one_port() failed; err=%i\n", rc);
		port->mapbase = 0;
@@ -681,7 +681,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,
#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
	/* This is not port which is used for console that's why clean it up */
	if (console_port == port &&
	    !(pdata->ulite_uart_driver->cons->flags & CON_ENABLED))
	    !(ulite_uart_driver.cons->flags & CON_ENABLED))
		console_port = NULL;
#endif