]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
video: fbdev: sh_mobile_lcdcfb: fix error return code in sh_mobile_lcdc_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 8 Feb 2017 15:43:59 +0000 (16:43 +0100)
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Wed, 8 Feb 2017 15:43:59 +0000 (16:43 +0100)
Fix to return error code -ENOMEM from the ioremap_nocache() error
handling case instead of 0, as done elsewhere in this function.

Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
drivers/video/fbdev/sh_mobile_lcdcfb.c

index 93469f94c09d1950f7c32ab535c0acd56b81dc9b..885ee3a563aa3cb06da934c822232369a05fb9f9 100644 (file)
@@ -2782,8 +2782,10 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev)
                priv->forced_fourcc = pdata->ch[0].fourcc;
 
        priv->base = ioremap_nocache(res->start, resource_size(res));
-       if (!priv->base)
+       if (!priv->base) {
+               error = -ENOMEM;
                goto err1;
+       }
 
        error = sh_mobile_lcdc_setup_clocks(priv, pdata->clock_source);
        if (error) {