power: max17042: divide by 0 Crash because r_sns init too late

On MMP2 brownstone divide by 0 error since probe sets r_sns after calling power_supply_register.

Move the code up a few lines. r_sns comes from the platform data.

PROP_CURRENT_AVG and PROP_CURRENT divide the result by r_sns.

Signed-off-by Philip Rakity

---
drivers/power/max17042_battery.c | 6 +++---

1 files changed, 3 insertions(+), 3 deletions(-)

drivers/power/max17042_battery.c +3 -3

index 9f0183c..4245806 100644
@@ -210,6 +210,9 @@ static int __devinit max17042_probe(struct i2c_client *client,
 if (!chip->pdata->enable_current_sense)
 chip->battery.num_properties -= 2;
 
+ if (chip->pdata->r_sns == 0)
+ chip->pdata->r_sns = MAX17042_DEFAULT_SNS_RESISTOR;
+
 ret = power_supply_register(&client->dev, &chip->battery);
 if (ret) {
 dev_err(&client->dev, "failed: power supply register\n");

@@ -226,9 +229,6 @@ static int __devinit max17042_probe(struct i2c_client *client,
 max17042_write_reg(client, MAX17042_CGAIN, 0x0000);
 max17042_write_reg(client, MAX17042_MiscCFG, 0x0003);
 max17042_write_reg(client, MAX17042_LearnCFG, 0x0007);
- } else {
- if (chip->pdata->r_sns == 0)
- chip->pdata->r_sns = MAX17042_DEFAULT_SNS_RESISTOR;
 }
 
 return 0;

Signature · 1 line

1.7.0.4

Philip Rakity<[email protected]> Date : 2011-08-13 13:18 (GMT+09:00)

Quoted 3 lines

On MMP2 brownstone divide by 0 error since probe sets r_sns after calling power_supply_register.

Quoted 6 lines

Move the code up a few lines. r_sns comes from the platform data.

PROP_CURRENT_AVG and PROP_CURRENT divide the result by r_sns.

Signed-off-by Philip Rakity

Acked-by MyungJoo Ham <[email protected]>