lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 118/475] video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ 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>
    ---
    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 cf2bfff2efbf..b91919861075 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.34.1


    \
     
     \ /
      Last update: 2022-04-14 16:23    [W:3.425 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site