path: root/drivers
diff options
authorLinus Torvalds <>2020-05-23 10:50:38 -0700
committerLinus Torvalds <>2020-05-23 10:50:38 -0700
commitd3044d7d220529a4ce0cbfe00de63996935908d1 (patch)
tree0db6a145ba7d2946f598030d85e01472a7642186 /drivers
parent9bca7c40850eca2613d79878e6d730faeaa602cf (diff)
parent17b4efdf4e4867079012a48ca10d965fe9d68822 (diff)
Merge tag 'tty-5.7-rc7' of git://
Pull tty/serial fix from Greg KH: "Here is a single serial driver fix for 5.7-rc7. It resolves an issue with the SiFive serial console init sequence that was reported a number of times. It has been in linux-next for a while now with no reported issues" * tag 'tty-5.7-rc7' of git:// tty: serial: add missing spin_lock_init for SiFive serial console
Diffstat (limited to 'drivers')
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/sifive.c b/drivers/tty/serial/sifive.c
index 13eadcb8aec4..0b5110dad051 100644
--- a/drivers/tty/serial/sifive.c
+++ b/drivers/tty/serial/sifive.c
@@ -883,6 +883,7 @@ console_initcall(sifive_console_init);
static void __ssp_add_console_port(struct sifive_serial_port *ssp)
+ spin_lock_init(&ssp->port.lock);
sifive_serial_console_ports[ssp->port.line] = ssp;