serial/imx: let probing fail for the dt case without a valid alias

When the uart device is instantiated by dt but dt doesn't provide an
alias then better let probing fail instead of falling back to an
unrelated device id used for the line number and no platform data.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 2813f0210377246a3b47bea49441fcc3545dc51d..92a5987924cf131d4484503857c3dca31e31272a 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1302,6 +1302,10 @@ static int serial_imx_resume(struct platform_device *dev)
 }
 
 #ifdef CONFIG_OF
+/*
+ * This function returns 1 iff pdev isn't a device instatiated by dt, 0 iff it
+ * could successfully get all information from dt or a negative errno.
+ */
 static int serial_imx_probe_dt(struct imx_port *sport,
                struct platform_device *pdev)
 {
@@ -1311,7 +1315,8 @@ static int serial_imx_probe_dt(struct imx_port *sport,
        int ret;
 
        if (!np)
-               return -ENODEV;
+               /* no device tree device */
+               return 1;
 
        ret = of_alias_get_id(np, "serial");
        if (ret < 0) {
@@ -1334,7 +1339,7 @@ static int serial_imx_probe_dt(struct imx_port *sport,
 static inline int serial_imx_probe_dt(struct imx_port *sport,
                struct platform_device *pdev)
 {
-       return -ENODEV;
+       return 1;
 }
 #endif
 
@@ -1369,8 +1374,10 @@ static int serial_imx_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        ret = serial_imx_probe_dt(sport, pdev);
-       if (ret == -ENODEV)
+       if (ret > 0)
                serial_imx_probe_pdata(sport, pdev);
+       else if (ret < 0)
+               goto free;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {