video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe()

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit fee5c1e4b789e41719af9fee0e2dd397cd31988f ]

If "sinfo->config" is not found, then return -ENODEV.  Don't
return success.

Fixes: b985172b328a ("video: atmel_lcdfb: add device tree suport")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit f3ef254c840de6245a9daff23c5de3c802140dab)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index 355b6120dc4f0dcd77433ac4c8753ffa5561e8af..1fc8de4ecbebf9e5e2974c3c97cba94d536d73c4 100644 (file)
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -1062,15 +1062,16 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
 
        INIT_LIST_HEAD(&info->modelist);
 
-       if (pdev->dev.of_node) {
-               ret = atmel_lcdfb_of_init(sinfo);
-               if (ret)
-                       goto free_info;
-       } else {
+       if (!pdev->dev.of_node) {
                dev_err(dev, "cannot get default configuration\n");
                goto free_info;
        }
 
+       ret = atmel_lcdfb_of_init(sinfo);
+       if (ret)
+               goto free_info;
+
+       ret = -ENODEV;
        if (!sinfo->config)
                goto free_info;