summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-14 06:20:35 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-14 06:20:35 +0800
commit61ad2a021d1db456a61293927f2879c980e88273 (patch)
treee250e67b6a8cc9fd7a35f7b3a8821e2f892fe659 /drivers/tty
parent19b6ecfca6b89cd3fb80af6c9b32afa54b442481 (diff)
downloadlinux-61ad2a021d1db456a61293927f2879c980e88273.tar.gz
linux-61ad2a021d1db456a61293927f2879c980e88273.tar.bz2
linux-61ad2a021d1db456a61293927f2879c980e88273.zip
Revert "serial-uartlite: Use allocated structure instead of static ones"
This reverts commit a00d9db8952b44f4d165e5200fff03c80a84947f. 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> Cc: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> Cc: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/uartlite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 2cced6a09254..c93336189924 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -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