[media] drivers/media/IR/ene_ir.c: fix NULL dereference
authorJiri Slaby <jslaby@suse.cz>
Fri, 1 Oct 2010 21:13:40 +0000 (18:13 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 09:54:30 +0000 (07:54 -0200)
When 'dev' allocation fails in ene_probe we jump to error label where we
dereference the 'dev'.  Fix it by jumping few lines below.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/IR/ene_ir.c

index 9f9afe7..f5beea0 100644 (file)
@@ -960,7 +960,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
        dev = kzalloc(sizeof(struct ene_device), GFP_KERNEL);
 
        if (!input_dev || !ir_props || !dev)
-               goto error;
+               goto error1;
 
        /* validate resources */
        error = -ENODEV;
@@ -1056,7 +1056,7 @@ error:
                free_irq(dev->irq, dev);
        if (dev && dev->hw_io >= 0)
                release_region(dev->hw_io, ENE_IO_SIZE);
-
+error1:
        input_free_device(input_dev);
        kfree(ir_props);
        kfree(dev);