1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index 7361dbe96be8..0779d5ab9ab1 100644
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -565,13 +565,13 @@ static int twl6040_probe(struct i2c_client *client,
                                       twl6040->supplies);
         if (ret != 0) {
                 dev_err(&client->dev, "Failed to get supplies: %d\n", ret);
-                goto regulator_get_err;
+                return ret;
         }
 
         ret = regulator_bulk_enable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
         if (ret != 0) {
                 dev_err(&client->dev, "Failed to enable supplies: %d\n", ret);
-                goto regulator_get_err;
+                return ret;
         }
 
         twl6040->dev = &client->dev;
@@ -667,9 +667,6 @@ readyirq_err:
         regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
 gpio_err:
         regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
-regulator_get_err:
-        i2c_set_clientdata(client, NULL);
-
         return ret;
 }
 
@@ -683,7 +680,6 @@ static int twl6040_remove(struct i2c_client *client)
         regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
 
         mfd_remove_devices(&client->dev);
-        i2c_set_clientdata(client, NULL);
 
         regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);