---

yaml --- r: 219355 b: refs/heads/master c: 2e75bce h: refs/heads/master i: 219353: 3cb120d 219351: ed99b00 v: v3
git-mirror · Oct 21, 2010 · 41afbce · 41afbce
1 parent 7ee59b5
commit 41afbce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92d0d66c1515c8ee3b700ab3d610587c71fe497f
+refs/heads/master: 2e75bcea00273146615dbc6ed3bbabce8d0bc1ca
diff --git a/trunk/drivers/media/IR/ene_ir.c b/trunk/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 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
 		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);