From 41afbcec39a792a956b622d3400e36e4c8218234 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Fri, 1 Oct 2010 18:13:40 -0300 Subject: [PATCH] --- yaml --- r: 219355 b: refs/heads/master c: 2e75bcea00273146615dbc6ed3bbabce8d0bc1ca h: refs/heads/master i: 219353: 3cb120d5065790061080fe69a6e542d33b2735a2 219351: ed99b00f1a979e0dc1886a380509cc48151371f1 v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/ene_ir.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38ccf360f55f..1c46220fae03 100644 --- 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 index 9f9afe7c603e..f5beea04906a 100644 --- 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);