Skip to content
This repository has been archived by the owner on Apr 13, 2019. It is now read-only.

sifive-serial: register uart port as console before adding it #137

Open
wants to merge 1 commit into
base: riscv-linux-4.15
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions drivers/tty/serial/sifive.c
Original file line number Diff line number Diff line change
Expand Up @@ -965,17 +965,18 @@ static int sifive_serial_probe(struct platform_device *pdev)
goto probe_out2;
}

sifive_serial_add_console_port(ssp);

r = uart_add_one_port(&sifive_serial_uart_driver, &ssp->port);
if (r != 0) {
dev_err(&pdev->dev, "could not add uart: %d\n", r);
goto probe_out3;
}

sifive_serial_add_console_port(ssp);

return 0;

probe_out3:
sifive_serial_remove_console_port(ssp);
free_irq(ssp->port.irq, ssp);
probe_out2:
clk_notifier_unregister(ssp->clk, &ssp->clk_notifier);
Expand Down