diff options
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/tps65910.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index 0226cdea2b47..6f5b8cf2f652 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c | |||
@@ -147,9 +147,6 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, | |||
147 | if (init_data == NULL) | 147 | if (init_data == NULL) |
148 | return -ENOMEM; | 148 | return -ENOMEM; |
149 | 149 | ||
150 | init_data->irq = pmic_plat_data->irq; | ||
151 | init_data->irq_base = pmic_plat_data->irq; | ||
152 | |||
153 | tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL); | 150 | tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL); |
154 | if (tps65910 == NULL) { | 151 | if (tps65910 == NULL) { |
155 | kfree(init_data); | 152 | kfree(init_data); |
@@ -170,6 +167,9 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, | |||
170 | if (ret < 0) | 167 | if (ret < 0) |
171 | goto err; | 168 | goto err; |
172 | 169 | ||
170 | init_data->irq = pmic_plat_data->irq; | ||
171 | init_data->irq_base = pmic_plat_data->irq; | ||
172 | |||
173 | tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base); | 173 | tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base); |
174 | 174 | ||
175 | ret = tps65910_irq_init(tps65910, init_data->irq, init_data); | 175 | ret = tps65910_irq_init(tps65910, init_data->irq, init_data); |