summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2011-09-20 14:13:06 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2011-10-24 14:09:15 +0200
commit677df0c9012ca3a6e0081f29f81506e5578d74f3 (patch)
tree464e640cf0da1ee2716cbb15f006c5b68ea2ba80 /drivers/mfd
parent2f8491d321d9313dfd854001dd196fd7835b6ac2 (diff)
downloadop-kernel-dev-677df0c9012ca3a6e0081f29f81506e5578d74f3.zip
op-kernel-dev-677df0c9012ca3a6e0081f29f81506e5578d74f3.tar.gz
mfd: Do not leak init_data in tps65912_device_init()
We neglect to free init_data on successful exit. I also moved two assignments to just before they are needed. This avoids doing them in case we hit an earlier error exit from the function. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Cc: Margarita Olaya Cabrera <magi@slimlogic.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/tps65912-core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/tps65912-core.c b/drivers/mfd/tps65912-core.c
index 955bc00..5fec23a 100644
--- a/drivers/mfd/tps65912-core.c
+++ b/drivers/mfd/tps65912-core.c
@@ -131,9 +131,6 @@ int tps65912_device_init(struct tps65912 *tps65912)
if (init_data == NULL)
return -ENOMEM;
- init_data->irq = pmic_plat_data->irq;
- init_data->irq_base = pmic_plat_data->irq;
-
mutex_init(&tps65912->io_mutex);
dev_set_drvdata(tps65912->dev, tps65912);
@@ -153,10 +150,13 @@ int tps65912_device_init(struct tps65912 *tps65912)
if (ret < 0)
goto err;
+ init_data->irq = pmic_plat_data->irq;
+ init_data->irq_base = pmic_plat_data->irq;
ret = tps65912_irq_init(tps65912, init_data->irq, init_data);
if (ret < 0)
goto err;
+ kfree(init_data);
return ret;
err:
OpenPOWER on IntegriCloud