aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2013-07-30 10:35:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-31 21:05:41 -0400
commit3fc1eb5fe5318d3eff9938240c29cc6ce2d6ce4e (patch)
tree48c7cfe71fbb8cb1c747e19479a8536a71007e95 /drivers/tty
parent11f1ad3ab4c2b2f208f7ef5b0360903bdf00df61 (diff)
serial/efm32-uart: don't slur over failure in probe_dt
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/efm32-uart.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index ce1ebbb0fe0d..98adaa1c054f 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -751,7 +751,8 @@ static int efm32_uart_probe(struct platform_device *pdev)
751 751
752 if (pdata) 752 if (pdata)
753 efm_port->pdata = *pdata; 753 efm_port->pdata = *pdata;
754 } 754 } else if (ret < 0)
755 goto err_probe_dt;
755 756
756 line = efm_port->port.line; 757 line = efm_port->port.line;
757 758
@@ -764,6 +765,7 @@ static int efm32_uart_probe(struct platform_device *pdev)
764 765
765 if (line >= 0 && line < ARRAY_SIZE(efm32_uart_ports)) 766 if (line >= 0 && line < ARRAY_SIZE(efm32_uart_ports))
766 efm32_uart_ports[line] = NULL; 767 efm32_uart_ports[line] = NULL;
768err_probe_dt:
767err_get_rxirq: 769err_get_rxirq:
768err_too_small: 770err_too_small:
769err_get_base: 771err_get_base: