diff options
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/arc_uart.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c index 6f7eadc424a3..d97e194b6bc5 100644 --- a/drivers/tty/serial/arc_uart.c +++ b/drivers/tty/serial/arc_uart.c | |||
@@ -547,8 +547,8 @@ arc_uart_init_one(struct platform_device *pdev, int dev_id) | |||
547 | } | 547 | } |
548 | uart->port.uartclk = val; | 548 | uart->port.uartclk = val; |
549 | 549 | ||
550 | if (of_property_read_u32(np, "baud", &val)) { | 550 | if (of_property_read_u32(np, "current-speed", &val)) { |
551 | dev_err(&pdev->dev, "baud property NOT set\n"); | 551 | dev_err(&pdev->dev, "current-speed property NOT set\n"); |
552 | return -EINVAL; | 552 | return -EINVAL; |
553 | } | 553 | } |
554 | uart->baud = val; | 554 | uart->baud = val; |
@@ -694,10 +694,8 @@ static int arc_serial_probe(struct platform_device *pdev) | |||
694 | return -ENODEV; | 694 | return -ENODEV; |
695 | 695 | ||
696 | dev_id = of_alias_get_id(np, "serial"); | 696 | dev_id = of_alias_get_id(np, "serial"); |
697 | if (dev_id < 0) { | 697 | if (dev_id < 0) |
698 | dev_err(&pdev->dev, "failed to get alias id: %d\n", dev_id); | 698 | dev_id = 0; |
699 | return dev_id; | ||
700 | } | ||
701 | 699 | ||
702 | rc = arc_uart_init_one(pdev, dev_id); | 700 | rc = arc_uart_init_one(pdev, dev_id); |
703 | if (rc) | 701 | if (rc) |