Merge v2.6.37-rc8 into powerpc/next

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / max8660.c

diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index d97220efae5ab4f1fde54cd909c724a3f5bf3523..c570e6eb0db2c5ab5e4d86776e7063e6a10c9179 100644 (file)
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -450,7 +450,7 @@ static int __devinit max8660_probe(struct i2c_client *client,
                }
        }
 
-       i2c_set_clientdata(client, rdev);
+       i2c_set_clientdata(client, max8660);
        dev_info(&client->dev, "Maxim 8660/8661 regulator driver loaded\n");
        return 0;
 
@@ -465,13 +465,13 @@ out:
 
 static int __devexit max8660_remove(struct i2c_client *client)
 {
-       struct regulator_dev **rdev = i2c_get_clientdata(client);
+       struct max8660 *max8660 = i2c_get_clientdata(client);
        int i;
 
        for (i = 0; i < MAX8660_V_END; i++)
-               if (rdev[i])
-                       regulator_unregister(rdev[i]);
-       kfree(rdev);
+               if (max8660->rdev[i])
+                       regulator_unregister(max8660->rdev[i]);
+       kfree(max8660);
 
        return 0;
 }