aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/regulator/max8649.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index 7f049c92ee52..3172da847d24 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -49,7 +49,6 @@
49#define MAX8649_RAMP_DOWN (1 << 1) 49#define MAX8649_RAMP_DOWN (1 << 1)
50 50
51struct max8649_regulator_info { 51struct max8649_regulator_info {
52 struct regulator_dev *regulator;
53 struct device *dev; 52 struct device *dev;
54 struct regmap *regmap; 53 struct regmap *regmap;
55 54
@@ -154,6 +153,7 @@ static int max8649_regulator_probe(struct i2c_client *client,
154{ 153{
155 struct max8649_platform_data *pdata = dev_get_platdata(&client->dev); 154 struct max8649_platform_data *pdata = dev_get_platdata(&client->dev);
156 struct max8649_regulator_info *info = NULL; 155 struct max8649_regulator_info *info = NULL;
156 struct regulator_dev *regulator;
157 struct regulator_config config = { }; 157 struct regulator_config config = { };
158 unsigned int val; 158 unsigned int val;
159 unsigned char data; 159 unsigned char data;
@@ -234,12 +234,12 @@ static int max8649_regulator_probe(struct i2c_client *client,
234 config.driver_data = info; 234 config.driver_data = info;
235 config.regmap = info->regmap; 235 config.regmap = info->regmap;
236 236
237 info->regulator = devm_regulator_register(&client->dev, &dcdc_desc, 237 regulator = devm_regulator_register(&client->dev, &dcdc_desc,
238 &config); 238 &config);
239 if (IS_ERR(info->regulator)) { 239 if (IS_ERR(regulator)) {
240 dev_err(info->dev, "failed to register regulator %s\n", 240 dev_err(info->dev, "failed to register regulator %s\n",
241 dcdc_desc.name); 241 dcdc_desc.name);
242 return PTR_ERR(info->regulator); 242 return PTR_ERR(regulator);
243 } 243 }
244 244
245 return 0; 245 return 0;