[media] drivers/media/video/cx231xx/cx231xx-cards.c: add missing kfree
authorJulia Lawall <julia@diku.dk>
Mon, 4 Jul 2011 14:11:41 +0000 (11:11 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:55:55 +0000 (17:55 -0300)
Clear the cx231xx_devused variable and free dev in the error handling code,
as done in the error handling code nearby.

The semantic match that finds this problem is as follows:

// <smpl>
@r@
identifier x;
@@

kfree(x)

@@
identifier r.x;
expression E1!=0,E2,E3,E4;
statement S;
@@

(
if (<+...x...+>) S
|
if (...) { ... when != kfree(x)
               when != if (...) { ... kfree(x); ... }
               when != x = E3
* return E1;
}
... when != x = E2
if (...) { ... when != x = E4
 kfree(x); ... return ...; }
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/cx231xx/cx231xx-cards.c

index 4b22afee18cf8eda1c93a2da7a6ee7f84e69603a..9a07d3df3e2006b0d821fc9e52645addb7976507 100644 (file)
@@ -1125,6 +1125,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
        if (assoc_desc->bFirstInterface != ifnum) {
                cx231xx_err(DRIVER_NAME ": Not found "
                            "matching IAD interface\n");
+               cx231xx_devused &= ~(1 << nr);
+               kfree(dev);
+               dev = NULL;
                return -ENODEV;
        }