From 780c2255be16b4410368bf757b33be1489ed494d Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Tue, 20 Sep 2011 14:13:06 -0700 Subject: [PATCH] --- yaml --- r: 273412 b: refs/heads/master c: 677df0c9012ca3a6e0081f29f81506e5578d74f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tps65912-core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ca38f2970104..f3cc0d87f44e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f8491d321d9313dfd854001dd196fd7835b6ac2 +refs/heads/master: 677df0c9012ca3a6e0081f29f81506e5578d74f3 diff --git a/trunk/drivers/mfd/tps65912-core.c b/trunk/drivers/mfd/tps65912-core.c index 955bc00e4b20..5fec23a9ac03 100644 --- a/trunk/drivers/mfd/tps65912-core.c +++ b/trunk/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: