serial/efm32-uart: don't slur over failure in probe_dt
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 30 Jul 2013 14:35:21 +0000 (16:35 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Aug 2013 01:05:41 +0000 (18:05 -0700)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/efm32-uart.c

index ce1ebbb0fe0dd0ce07bf33b86339f5576bce232b..98adaa1c054f60f0f9b13e5f5d11fcc3a7173498 100644 (file)
@@ -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: