Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbb48e7c authored by Tushar Behera's avatar Tushar Behera Committed by Liam Girdwood
Browse files

regulator: MAX8997: Fix for divide by zero error 



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: default avatarTushar Behera <tushar.behera@linaro.org>
Acked-by: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent e2cf3137

drivers/regulator/max8997.c

+4 −4
Original line number Diff line number Diff line
@@ -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++)