From: Jiri Slaby <jslaby@suse.cz>
Date: Fri, 1 Oct 2010 21:13:40 +0000 (-0300)
Subject: [media] drivers/media/IR/ene_ir.c: fix NULL dereference
X-Git-Tag: upstream/snapshot3+hdmi~12606^2~184
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e75bcea00273146615dbc6ed3bbabce8d0bc1ca;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

[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>
---

diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/IR/ene_ir.c
index 9f9afe7..f5beea0 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);