Commit 6a63ba97 authored Jul 11, 2020 by Andy Shevchenko Committed by Greg Kroah-Hartman Jul 21, 2020

Revert "serial: amba-pl011: Make sure we initialize the port.lock spinlock"

This reverts commit 8508f4cb.

There has been a quick fix against uninitialised lock revealed by
the commit f743061a ("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: 8508f4cb ("serial: amba-pl011: Make sure we initialize the port.lock spinlock")
Depends-on: f743061a ("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>

parent 30336ef6

drivers/tty/serial/amba-pl011.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;