Commit 125d10f0 authored Dec 03, 2021 by Dan Carpenter Committed by Greg Kroah-Hartman Apr 15, 2022

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



[ Upstream commit fee5c1e4b789e41719af9fee0e2dd397cd31988f ]

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

Fixes: b985172b ("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>

parent da8b269c

drivers/video/fbdev/atmel_lcdfb.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -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;