From fddcfbf905d715c071a2f145ffe81d8db8e3e09c Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 10 Apr 2012 22:45:01 +0800 Subject: [PATCH] --- yaml --- r: 302196 b: refs/heads/master c: d914d81b74fd4e91aed334c3f664be4b94364ee8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/anatop-regulator.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ec38ddccd051..594886a937d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cb2f1239dd7acf72fb60adb53c1fdaa65b719a2 +refs/heads/master: d914d81b74fd4e91aed334c3f664be4b94364ee8 diff --git a/trunk/drivers/regulator/anatop-regulator.c b/trunk/drivers/regulator/anatop-regulator.c index 53969af17558..8675c91ed21a 100644 --- a/trunk/drivers/regulator/anatop-regulator.c +++ b/trunk/drivers/regulator/anatop-regulator.c @@ -122,6 +122,7 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev) struct anatop_regulator *sreg; struct regulator_init_data *initdata; struct anatop *anatopmfd = dev_get_drvdata(pdev->dev.parent); + struct regulator_config config = { }; int ret = 0; initdata = of_get_regulator_init_data(dev, np); @@ -178,9 +179,13 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev) rdesc->n_voltages = (sreg->max_voltage - sreg->min_voltage) / 25000 + 1; + config.dev = &pdev->dev; + config.init_data = initdata; + config.driver_data = sreg; + config.of_node = pdev->dev.of_node; + /* register regulator */ - rdev = regulator_register(rdesc, dev, - initdata, sreg, pdev->dev.of_node); + rdev = regulator_register(rdesc, &config); if (IS_ERR(rdev)) { dev_err(dev, "failed to register %s\n", rdesc->name);