From f390eaf9031f924ade9411a9bd45107fc8711708 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Wed, 17 Aug 2011 10:18:34 +0900 Subject: [PATCH] --- yaml --- r: 283427 b: refs/heads/master c: cf7a8c03db792894f436db5f3ffc44d947b9b068 h: refs/heads/master i: 283425: 6fc456a0410a36f95666c6c85aad507ae8b06ff8 283423: 274726349117cf35e4557429151ca0ec82848180 v: v3 --- [refs] | 2 +- trunk/drivers/power/max17042_battery.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a770bf5ae810..be7e609b608b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91d8b0d6f81d2946962ee559090a34834dfd467b +refs/heads/master: cf7a8c03db792894f436db5f3ffc44d947b9b068 diff --git a/trunk/drivers/power/max17042_battery.c b/trunk/drivers/power/max17042_battery.c index 61fb6d7dfe7a..a6dc9c7a95e2 100644 --- a/trunk/drivers/power/max17042_battery.c +++ b/trunk/drivers/power/max17042_battery.c @@ -111,12 +111,12 @@ static int max17042_get_property(struct power_supply *psy, val->intval *= 10000; /* Units of LSB = 10mV */ break; case POWER_SUPPLY_PROP_VOLTAGE_NOW: - val->intval = max17042_read_reg(chip->client, - MAX17042_VCELL) * 83; /* 1000 / 12 = 83 */ + val->intval = max17042_read_reg(chip->client, MAX17042_VCELL) + * 625 / 8; break; case POWER_SUPPLY_PROP_VOLTAGE_AVG: - val->intval = max17042_read_reg(chip->client, - MAX17042_AvgVCELL) * 83; + val->intval = max17042_read_reg(chip->client, MAX17042_AvgVCELL) + * 625 / 8; break; case POWER_SUPPLY_PROP_CAPACITY: val->intval = max17042_read_reg(chip->client,