From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue, 30 Jul 2013 14:35:21 +0000 (+0200)
Subject: serial/efm32-uart: don't slur over failure in probe_dt
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3fc1eb5fe5318d3eff9938240c29cc6ce2d6ce4e;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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)
 
 		if (pdata)
 			efm_port->pdata = *pdata;
-	}
+	} else if (ret < 0)
+		goto err_probe_dt;
 
 	line = efm_port->port.line;
 
@@ -764,6 +765,7 @@ static int efm32_uart_probe(struct platform_device *pdev)
 
 		if (line >= 0 && line < ARRAY_SIZE(efm32_uart_ports))
 			efm32_uart_ports[line] = NULL;
+err_probe_dt:
 err_get_rxirq:
 err_too_small:
 err_get_base: