Skip to content

Commit 61ad2a0

Browse files
committed
Revert "serial-uartlite: Use allocated structure instead of static ones"
This reverts commit a00d9db. 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 <[email protected]> Cc: Shubhrajyoti Datta <[email protected]> Cc: Michal Simek <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 19b6ecf commit 61ad2a0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/tty/serial/uartlite.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,
670670
#endif
671671

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

0 commit comments

Comments
 (0)