# \[PATCH\] video: fbdev: atmel\_lcdfb: fix an error code in atmel\_lcdfb\_probe()

- Subsystems: FRAMEBUFFER LAYER, MICROCHIP LCDFB DRIVER, THE REST
- Maintainers: Helge Deller, Nicolas Ferre, Linus Torvalds
- List: linux-fbdev
- 2 messages, 2 authors
- Page: https://ratatoskr.run/linux-fbdev/2021/12/9210775/t

## \[PATCH\] video: fbdev: atmel\_lcdfb: fix an error code in atmel\_lcdfb\_probe()

- From: Dan Carpenter \<hidden\>
- Date: 2021-12-03 09:58:40 
- Message: https://ratatoskr.run/linux-fbdev/2021/12/9210775.md

```text
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 <redacted>
---
 drivers/video/fbdev/atmel_lcdfb.c | 11 ++++++-----
 1 file 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;
 
-- 
2.20.1

```

## Re: \[PATCH\] video: fbdev: atmel\_lcdfb: fix an error code in atmel\_lcdfb\_probe()

- From: Nicolas Ferre \<nicolas.ferre@microchip.com\>
- Date: 2021-12-03 13:38:00 
- Message: https://ratatoskr.run/linux-fbdev/2021/12/9210801.md

```text
On 03/12/2021 at 10:58, Dan Carpenter wrote:
> 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 <redacted>

Looks good to me: thanks Dan!

Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>

Best regards,
  Nicolas

> ---
>   drivers/video/fbdev/atmel_lcdfb.c | 11 ++++++-----
>   1 file 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;
>
> --
> 2.20.1
>


-- 
Nicolas Ferre
```