diff options
| -rw-r--r-- | drivers/tty/serial/imx.c | 3 | ||||
| -rw-r--r-- | drivers/tty/serial/vt8500_serial.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index a0ebbc9ce5cd..042aa077b5b3 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c | |||
| @@ -1912,9 +1912,6 @@ static int serial_imx_probe_dt(struct imx_port *sport, | |||
| 1912 | 1912 | ||
| 1913 | sport->devdata = of_id->data; | 1913 | sport->devdata = of_id->data; |
| 1914 | 1914 | ||
| 1915 | if (of_device_is_stdout_path(np)) | ||
| 1916 | add_preferred_console(imx_reg.cons->name, sport->port.line, 0); | ||
| 1917 | |||
| 1918 | return 0; | 1915 | return 0; |
| 1919 | } | 1916 | } |
| 1920 | #else | 1917 | #else |
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index 93b697a0de65..15ad6fcda88b 100644 --- a/drivers/tty/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c | |||
| @@ -561,12 +561,13 @@ static int vt8500_serial_probe(struct platform_device *pdev) | |||
| 561 | if (!mmres || !irqres) | 561 | if (!mmres || !irqres) |
| 562 | return -ENODEV; | 562 | return -ENODEV; |
| 563 | 563 | ||
| 564 | if (np) | 564 | if (np) { |
| 565 | port = of_alias_get_id(np, "serial"); | 565 | port = of_alias_get_id(np, "serial"); |
| 566 | if (port >= VT8500_MAX_PORTS) | 566 | if (port >= VT8500_MAX_PORTS) |
| 567 | port = -1; | 567 | port = -1; |
| 568 | else | 568 | } else { |
| 569 | port = -1; | 569 | port = -1; |
| 570 | } | ||
| 570 | 571 | ||
| 571 | if (port < 0) { | 572 | if (port < 0) { |
| 572 | /* calculate the port id */ | 573 | /* calculate the port id */ |
