summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-12-03 12:58:08 +0300
committerHelge Deller <deller@gmx.de>2022-01-30 19:38:35 +0100
commitfee5c1e4b789e41719af9fee0e2dd397cd31988f (patch)
tree17422028b76ff758b01acb553c6df28aeddbaa12 /drivers/video
parent0f8a1cae923670b1cabb9a8f416271344159bd50 (diff)
downloadlinux-stable-fee5c1e4b789e41719af9fee0e2dd397cd31988f.tar.gz
linux-stable-fee5c1e4b789e41719af9fee0e2dd397cd31988f.tar.bz2
linux-stable-fee5c1e4b789e41719af9fee0e2dd397cd31988f.zip
video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe()
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/atmel_lcdfb.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index 355b6120dc4f..1fc8de4ecbeb 100644
--- 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;