Revert "serial: sh-sci: Initialize spinlock for uart console"
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Sat, 11 Jul 2020 13:53:46 +0000 (16:53 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Jul 2020 16:21:49 +0000 (18:21 +0200)
This reverts commit f38278e9b810b06aff2981d505267be984423ba3.

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: f38278e9b810 ("serial: sh-sci: Initialize spinlock for uart console")
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-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sh-sci.c

index 204bb68ce3ca91a1d9338658154bd5465109e4d3..e1179e74a2b89d892f4c8e0edceb3378c6755e5a 100644 (file)
@@ -3301,9 +3301,6 @@ static int sci_probe_single(struct platform_device *dev,
                sciport->port.flags |= UPF_HARD_FLOW;
        }
 
-       if (sci_uart_driver.cons->index == sciport->port.line)
-               spin_lock_init(&sciport->port.lock);
-
        ret = uart_add_one_port(&sci_uart_driver, &sciport->port);
        if (ret) {
                sci_cleanup_single(sciport);