Skip to content

Commit

Permalink
Revert "serial: sh-sci: Initialize spinlock for uart console"
Browse files Browse the repository at this point in the history
This reverts commit f38278e.

There has been a quick fix against uninitialised lock revealed by
the commit f743061 ("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: f38278e ("serial: sh-sci: Initialize spinlock for uart console")
Depends-on: f743061 ("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>
  • Loading branch information
Andy Shevchenko authored and Greg Kroah-Hartman committed Jul 21, 2020
1 parent dfe51d9 commit 71614e1
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/tty/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 71614e1

Please sign in to comment.