diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-07-11 16:53:43 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-21 18:21:49 +0200 |
| commit | 6a63ba971edbbfae280ea0cc4502e7ba4354125b (patch) | |
| tree | 6af3a15a1648557952979a0c208a9a95016d8647 /drivers/tty/serial/amba-pl011.c | |
| parent | Revert "serial: sunhv: Initialize lock for non-registered console" (diff) | |
| download | linux-dev-6a63ba971edbbfae280ea0cc4502e7ba4354125b.tar.xz linux-dev-6a63ba971edbbfae280ea0cc4502e7ba4354125b.zip | |
Revert "serial: amba-pl011: Make sure we initialize the port.lock spinlock"
This reverts commit 8508f4cba308f785b2fd4b8c38849c117b407297.
There has been a quick fix against uninitialised lock revealed by
the commit f743061a85f5 ("serial: core: Initialise spin lock before use
in uart_configure_port()"). Since we have now better fix in serial core,
this may be safely reverted.
Fixes: 8508f4cba308 ("serial: amba-pl011: Make sure we initialize the port.lock spinlock")
Depends-on: f743061a85f5 ("serial: core: Initialise spin lock before use in uart_configure_port()")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200711135346.71171-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/amba-pl011.c')
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 8efd7c2a34fe..c010f639298d 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2607,7 +2607,6 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, uap->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_AMBA_PL011_CONSOLE); uap->port.flags = UPF_BOOT_AUTOCONF; uap->port.line = index; - spin_lock_init(&uap->port.lock); amba_ports[index] = uap; |