aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/regulator/max8660.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index 7eee2ca18541..f187c8f13e22 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -382,7 +382,7 @@ static int max8660_probe(struct i2c_client *client,
382 const struct i2c_device_id *i2c_id) 382 const struct i2c_device_id *i2c_id)
383{ 383{
384 struct device *dev = &client->dev; 384 struct device *dev = &client->dev;
385 struct max8660_platform_data *pdata = dev_get_platdata(dev); 385 struct max8660_platform_data pdata_of, *pdata = dev_get_platdata(dev);
386 struct regulator_config config = { }; 386 struct regulator_config config = { };
387 struct max8660 *max8660; 387 struct max8660 *max8660;
388 int boot_on, i, id, ret = -EINVAL; 388 int boot_on, i, id, ret = -EINVAL;
@@ -391,7 +391,6 @@ static int max8660_probe(struct i2c_client *client,
391 391
392 if (dev->of_node && !pdata) { 392 if (dev->of_node && !pdata) {
393 const struct of_device_id *id; 393 const struct of_device_id *id;
394 struct max8660_platform_data pdata_of;
395 394
396 id = of_match_device(of_match_ptr(max8660_dt_ids), dev); 395 id = of_match_device(of_match_ptr(max8660_dt_ids), dev);
397 if (!id) 396 if (!id)