Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[~andy/linux] / drivers / video / atmel_lcdfb.c

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 15055395cd95a1eff62591c81111501dda1e6560..94cac9f9919ffa1ce9c278812b4708b0b80bfcdf 100644 (file)
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -931,8 +931,10 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
                }
 
                info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
-               if (!info->screen_base)
+               if (!info->screen_base) {
+                       ret = -ENOMEM;
                        goto release_intmem;
+               }
 
                /*
                 * Don't clear the framebuffer -- someone may have set
@@ -960,6 +962,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
        sinfo->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
        if (!sinfo->mmio) {
                dev_err(dev, "cannot map LCDC registers\n");
+               ret = -ENOMEM;
                goto release_mem;
        }