]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Revert "serial: amba-pl011: Make sure we initialize the port.lock spinlock"
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Sat, 11 Jul 2020 13:53:43 +0000 (16:53 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Jul 2020 16:21:49 +0000 (18:21 +0200)
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>
drivers/tty/serial/amba-pl011.c

index 8efd7c2a34fe8d27728c62e8139e7724a4460f86..c010f639298dd17a451e5606c69b525417e08529 100644 (file)
@@ -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;