drivers: video: fbdev: atmel_lcdfb.c: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Wed, 6 Aug 2014 20:12:18 +0000 (22:12 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 26 Aug 2014 10:04:15 +0000 (13:04 +0300)
Convert a zero return value on error 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: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/fbdev/atmel_lcdfb.c

index 92640d46770a19f5b249f63ad4b020fa6fa84b1a..1d8bdb92939b2c034dbd6b7e15f3b076146a6c6a 100644 (file)
@@ -1102,12 +1102,14 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
        timings = of_get_display_timings(display_np);
        if (!timings) {
                dev_err(dev, "failed to get display timings\n");
+               ret = -EINVAL;
                goto put_display_node;
        }
 
        timings_np = of_find_node_by_name(display_np, "display-timings");
        if (!timings_np) {
                dev_err(dev, "failed to find display-timings node\n");
+               ret = -ENODEV;
                goto put_display_node;
        }