diff options
Diffstat (limited to 'drivers/mfd/tps65912-core.c')
-rw-r--r-- | drivers/mfd/tps65912-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/tps65912-core.c b/drivers/mfd/tps65912-core.c index 955bc00e4b20..5fec23a9ac03 100644 --- a/drivers/mfd/tps65912-core.c +++ b/drivers/mfd/tps65912-core.c | |||
@@ -131,9 +131,6 @@ int tps65912_device_init(struct tps65912 *tps65912) | |||
131 | if (init_data == NULL) | 131 | if (init_data == NULL) |
132 | return -ENOMEM; | 132 | return -ENOMEM; |
133 | 133 | ||
134 | init_data->irq = pmic_plat_data->irq; | ||
135 | init_data->irq_base = pmic_plat_data->irq; | ||
136 | |||
137 | mutex_init(&tps65912->io_mutex); | 134 | mutex_init(&tps65912->io_mutex); |
138 | dev_set_drvdata(tps65912->dev, tps65912); | 135 | dev_set_drvdata(tps65912->dev, tps65912); |
139 | 136 | ||
@@ -153,10 +150,13 @@ int tps65912_device_init(struct tps65912 *tps65912) | |||
153 | if (ret < 0) | 150 | if (ret < 0) |
154 | goto err; | 151 | goto err; |
155 | 152 | ||
153 | init_data->irq = pmic_plat_data->irq; | ||
154 | init_data->irq_base = pmic_plat_data->irq; | ||
156 | ret = tps65912_irq_init(tps65912, init_data->irq, init_data); | 155 | ret = tps65912_irq_init(tps65912, init_data->irq, init_data); |
157 | if (ret < 0) | 156 | if (ret < 0) |
158 | goto err; | 157 | goto err; |
159 | 158 | ||
159 | kfree(init_data); | ||
160 | return ret; | 160 | return ret; |
161 | 161 | ||
162 | err: | 162 | err: |