mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
Revert "serial-uartlite: Use allocated structure instead of static ones"
This reverts commit a00d9db895
.
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>
This commit is contained in:
parent
19b6ecfca6
commit
61ad2a021d
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue