1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index 44b97c70a61..36b88e39549 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -74,24 +74,27 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client,
 
         ret = da9052_i2c_enable_multiwrite(da9052);
         if (ret < 0)
-                goto err;
+                goto err_regmap;
 
         ret = da9052_device_init(da9052, id->driver_data);
         if (ret != 0)
-                goto err;
+                goto err_regmap;
 
         return 0;
 
+err_regmap:
+        regmap_exit(da9052->regmap);
 err:
         kfree(da9052);
         return ret;
 }
 
-static int da9052_i2c_remove(struct i2c_client *client)
+static int __devexit da9052_i2c_remove(struct i2c_client *client)
 {
         struct da9052 *da9052 = i2c_get_clientdata(client);
 
         da9052_device_exit(da9052);
+        regmap_exit(da9052->regmap);
         kfree(da9052);
 
         return 0;
@@ -107,7 +110,7 @@ static struct i2c_device_id da9052_i2c_id[] = {
 
 static struct i2c_driver da9052_i2c_driver = {
         .probe = da9052_i2c_probe,
-        .remove = da9052_i2c_remove,
+        .remove = __devexit_p(da9052_i2c_remove),
         .id_table = da9052_i2c_id,
         .driver = {
                 .name = "da9052",