1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 2229e66d80db..6f5b8cf2f652 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -147,12 +147,11 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
         if (init_data == NULL)
                 return -ENOMEM;
 
-        init_data->irq = pmic_plat_data->irq;
-        init_data->irq_base = pmic_plat_data->irq;
-
         tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL);
-        if (tps65910 == NULL)
+        if (tps65910 == NULL) {
+                kfree(init_data);
                 return -ENOMEM;
+        }
 
         i2c_set_clientdata(i2c, tps65910);
         tps65910->dev = &i2c->dev;
@@ -168,17 +167,22 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
         if (ret < 0)
                 goto err;
 
+        init_data->irq = pmic_plat_data->irq;
+        init_data->irq_base = pmic_plat_data->irq;
+
         tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);
 
         ret = tps65910_irq_init(tps65910, init_data->irq, init_data);
         if (ret < 0)
                 goto err;
 
+        kfree(init_data);
         return ret;
 
 err:
         mfd_remove_devices(tps65910->dev);
         kfree(tps65910);
+        kfree(init_data);
         return ret;
 }
 
@@ -187,6 +191,7 @@ static int tps65910_i2c_remove(struct i2c_client *i2c)
         struct tps65910 *tps65910 = i2c_get_clientdata(i2c);
 
         mfd_remove_devices(tps65910->dev);
+        tps65910_irq_exit(tps65910);
         kfree(tps65910);
 
         return 0;