diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-08 15:37:57 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-08 15:37:57 +0200 |
| commit | 3cbe7ec9b504c6cc0b5e47015db03dc56e9202c1 (patch) | |
| tree | 5676831e3552445316b8252532752375eb7cbb9f /drivers/regulator/pcf50633-regulator.c | |
| parent | 7d1467b5820a384e3e274ee051f44ff749c5ab71 (diff) | |
| parent | 687d09365fef8fe4bcabb909fe8a5e9a1b0834a2 (diff) | |
Merge branch 'pcf50633-2.6.34' into om-gta02-2.6.34
Diffstat (limited to 'drivers/regulator/pcf50633-regulator.c')
| -rw-r--r-- | drivers/regulator/pcf50633-regulator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c index c8f41dc05b7..6ef66d971a8 100644 --- a/drivers/regulator/pcf50633-regulator.c +++ b/drivers/regulator/pcf50633-regulator.c @@ -313,11 +313,10 @@ static int __devinit pcf50633_regulator_probe(struct platform_device *pdev) struct regulator_dev *rdev; struct pcf50633 *pcf; - /* Already set by core driver */ pcf = dev_to_pcf50633(pdev->dev.parent); rdev = regulator_register(®ulators[pdev->id], &pdev->dev, - pdev->dev.platform_data, pcf); + &pcf->pdata->reg_init_data[pdev->id], pcf); if (IS_ERR(rdev)) return PTR_ERR(rdev); |