| Message ID | 1308627539-8980-1-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Accepted |
| Commit | dbb48e7c3db4871803fc990864e37917e413ccb2 |
| Headers | show |
On Tue, Jun 21, 2011 at 09:08:59AM +0530, Tushar Behera wrote: > Currently, ramp_delay variable is used uninitialzed in > max8997_set_voltage_ldobuck which gets called through > regulator_register calls. > To fix the problem, in max8997_pmic_probe, ramp_delay initialization > code is moved before calls to regulator_register. Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
On Tue, 2011-06-21 at 09:08 +0530, Tushar Behera wrote: > Currently, ramp_delay variable is used uninitialzed in > max8997_set_voltage_ldobuck which gets called through > regulator_register calls. > > To fix the problem, in max8997_pmic_probe, ramp_delay initialization > code is moved before calls to regulator_register. > > Cc: Liam Girdwood <lrg@ti.com> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > Cc: MyungJoo Ham <myungjoo.ham@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Samuel Ortiz <sameo@linux.intel.com> > Signed-off-by: Tushar Behera <tushar.behera@linaro.org> > --- > drivers/regulator/max8997.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c > index 10d5a1d..0fc7b8c 100644 > --- a/drivers/regulator/max8997.c > +++ b/drivers/regulator/max8997.c > @@ -1124,6 +1124,10 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev) > 0x3f); > } > > + /* Misc Settings */ > + max8997->ramp_delay = 10; /* set 10mV/us, which is the default */ > + max8997_write_reg(i2c, MAX8997_REG_BUCKRAMP, (0xf << 4) | 0x9); > + > for (i = 0; i < pdata->num_regulators; i++) { > const struct voltage_map_desc *desc; > int id = pdata->regulators[i].id; > @@ -1148,10 +1152,6 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev) > } > } > > - /* Misc Settings */ > - max8997->ramp_delay = 10; /* set 10mV/us, which is the default */ > - max8997_write_reg(i2c, MAX8997_REG_BUCKRAMP, (0xf << 4) | 0x9); > - > return 0; > err: > for (i = 0; i < max8997->num_regulators; i++) Applied. Thanks Liam
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index 10d5a1d..0fc7b8c 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997.c @@ -1124,6 +1124,10 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev) 0x3f); } + /* Misc Settings */ + max8997->ramp_delay = 10; /* set 10mV/us, which is the default */ + max8997_write_reg(i2c, MAX8997_REG_BUCKRAMP, (0xf << 4) | 0x9); + for (i = 0; i < pdata->num_regulators; i++) { const struct voltage_map_desc *desc; int id = pdata->regulators[i].id; @@ -1148,10 +1152,6 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev) } } - /* Misc Settings */ - max8997->ramp_delay = 10; /* set 10mV/us, which is the default */ - max8997_write_reg(i2c, MAX8997_REG_BUCKRAMP, (0xf << 4) | 0x9); - return 0; err: for (i = 0; i < max8997->num_regulators; i++)
Currently, ramp_delay variable is used uninitialzed in max8997_set_voltage_ldobuck which gets called through regulator_register calls. To fix the problem, in max8997_pmic_probe, ramp_delay initialization code is moved before calls to regulator_register. Cc: Liam Girdwood <lrg@ti.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: MyungJoo Ham <myungjoo.ham@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Tushar Behera <tushar.behera@linaro.org> --- drivers/regulator/max8997.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)