summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2012-09-18 14:07:55 +0200
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-09-22 21:41:52 +0000
commit130320bfe0ca88b0f80dde758a551b5beffb9f62 (patch)
tree3953894b61ba37105e6e6f0250846bbbb0466fcd
parentb157dd1c38de2acad1b490851bab2244f4ef517a (diff)
downloadlinux-3.10-130320bfe0ca88b0f80dde758a551b5beffb9f62.tar.gz
linux-3.10-130320bfe0ca88b0f80dde758a551b5beffb9f62.tar.bz2
linux-3.10-130320bfe0ca88b0f80dde758a551b5beffb9f62.zip
drivers/video/atmel_lcdfb.c: fix error return code
Convert a nonnegative error return code to a negative one, as returned elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
-rw-r--r--drivers/video/atmel_lcdfb.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 15055395cd9..94cac9f9919 100644
--- 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;
}