[media] drivers/media/IR/ene_ir.c: fix NULL dereference

[mv-sheeva.git] / drivers / media / IR / ene_ir.c

diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/IR/ene_ir.c
index 9f9afe7c603e92e552de69f52b0e261393d70da4..f5beea04906af65b2a3be99935e5be87c7b73e5f 100644 (file)
--- a/drivers/media/IR/ene_ir.c
+++ b/drivers/media/IR/ene_ir.c
@@ -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);