aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/max8660.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/regulator/max8660.c')
-rw-r--r--drivers/regulator/max8660.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index 0e327871fd0e..88f678e4a1a7 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -361,6 +361,7 @@ static int __devinit max8660_probe(struct i2c_client *client,
361{ 361{
362 struct regulator_dev **rdev; 362 struct regulator_dev **rdev;
363 struct max8660_platform_data *pdata = client->dev.platform_data; 363 struct max8660_platform_data *pdata = client->dev.platform_data;
364 struct regulator_config config = { };
364 struct max8660 *max8660; 365 struct max8660 *max8660;
365 int boot_on, i, id, ret = -EINVAL; 366 int boot_on, i, id, ret = -EINVAL;
366 367
@@ -449,9 +450,11 @@ static int __devinit max8660_probe(struct i2c_client *client,
449 450
450 id = pdata->subdevs[i].id; 451 id = pdata->subdevs[i].id;
451 452
452 rdev[i] = regulator_register(&max8660_reg[id], &client->dev, 453 config.dev = &client->dev;
453 pdata->subdevs[i].platform_data, 454 config.init_data = pdata->subdevs[i].platform_data;
454 max8660, NULL); 455 config.driver_data = max8660;
456
457 rdev[i] = regulator_register(&max8660_reg[id], &config);
455 if (IS_ERR(rdev[i])) { 458 if (IS_ERR(rdev[i])) {
456 ret = PTR_ERR(rdev[i]); 459 ret = PTR_ERR(rdev[i]);
457 dev_err(&client->dev, "failed to register %s\n", 460 dev_err(&client->dev, "failed to register %s\n",