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

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@localhostReported-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
...@@ -670,7 +670,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq, ...@@ -670,7 +670,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,
#endif #endif
/* Register the port */ /* Register the port */
rc = uart_add_one_port(pdata->ulite_uart_driver, port); rc = uart_add_one_port(&ulite_uart_driver, port);
if (rc) { if (rc) {
dev_err(dev, "uart_add_one_port() failed; err=%i\n", rc); dev_err(dev, "uart_add_one_port() failed; err=%i\n", rc);
port->mapbase = 0; port->mapbase = 0;
...@@ -681,7 +681,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq, ...@@ -681,7 +681,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,
#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
/* This is not port which is used for console that's why clean it up */ /* This is not port which is used for console that's why clean it up */
if (console_port == port && if (console_port == port &&
!(pdata->ulite_uart_driver->cons->flags & CON_ENABLED)) !(ulite_uart_driver.cons->flags & CON_ENABLED))
console_port = NULL; console_port = NULL;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment