Merge remote-tracking branch 'regulator/topic/enable-invert' into v3.9-rc8

[karo-tx-linux.git] / drivers / regulator / max8649.c

diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index fdb67ff9812908188c54de0ba0fb42e0ae21c217..db6c9be10f3f3470de157a0c0e0592645d5b3a83 100644 (file)
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -248,10 +248,8 @@ static int max8649_regulator_remove(struct i2c_client *client)
 {
        struct max8649_regulator_info *info = i2c_get_clientdata(client);
 
-       if (info) {
-               if (info->regulator)
-                       regulator_unregister(info->regulator);
-       }
+       if (info)
+               regulator_unregister(info->regulator);
 
        return 0;
 }