]> git.karo-electronics.de Git - linux-beck.git/commitdiff
usb: musb: dsps: fix devm_ioremap_resource error detection code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Mon, 19 Aug 2013 16:00:08 +0000 (18:00 +0200)
committerFelipe Balbi <balbi@ti.com>
Tue, 27 Aug 2013 19:17:03 +0000 (14:17 -0500)
devm_ioremap_resource returns an ERR_PTR value, not NULL, on failure.
Furthermore, the value returned by devm_ioremap_resource should be tested.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e,e1;
statement S;
@@

*e = devm_ioremap_resource(...);
if (!e1) S

// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/musb/musb_dsps.c

index 4ffbaace791389c1b18ed821a9e3e243d70c1f58..4ad52e76c4ddfbcd22c34269594afe5e93dcc296 100644 (file)
@@ -361,8 +361,8 @@ static int dsps_musb_init(struct musb *musb)
                return -EINVAL;
 
        reg_base = devm_ioremap_resource(dev, r);
-       if (!musb->ctrl_base)
-               return -EINVAL;
+       if (IS_ERR(reg_base))
+               return PTR_ERR(reg_base);
        musb->ctrl_base = reg_base;
 
        /* NOP driver needs change if supporting dual instance */