summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2010-10-01 18:13:40 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 07:54:30 -0200
commit2e75bcea00273146615dbc6ed3bbabce8d0bc1ca (patch)
treefd7b8fddccd6dd0ba61f0448ff23721c5748208c /drivers/media
parent92d0d66c1515c8ee3b700ab3d610587c71fe497f (diff)
[media] drivers/media/IR/ene_ir.c: fix NULL dereference
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/IR/ene_ir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/IR/ene_ir.c
index 9f9afe7c603..f5beea04906 100644
--- 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);