From 50f81af70094d9ce4d15d0fb102bc2a93326edf4 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Thu, 15 Mar 2012 21:01:28 +0400 Subject: [PATCH] --- yaml --- r: 297957 b: refs/heads/master c: df58c04c9f4182f979973a06ce40b44a5b84aeb5 h: refs/heads/master i: 297955: 5f32d3a95e7d7a89fd426d688c0740090e2a324e v: v3 --- [refs] | 2 +- trunk/drivers/power/charger-manager.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b9cda637d7bc..845707a3cc0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb2a95c2d2450be1ac942adf6815375f620b7015 +refs/heads/master: df58c04c9f4182f979973a06ce40b44a5b84aeb5 diff --git a/trunk/drivers/power/charger-manager.c b/trunk/drivers/power/charger-manager.c index e610e6b46b5b..9eca9f1ff0ea 100644 --- a/trunk/drivers/power/charger-manager.c +++ b/trunk/drivers/power/charger-manager.c @@ -399,7 +399,8 @@ static int charger_get_property(struct power_supply *psy, struct charger_manager *cm = container_of(psy, struct charger_manager, charger_psy); struct charger_desc *desc = cm->desc; - int i, ret = 0, uV; + int ret = 0; + int uV; switch (psp) { case POWER_SUPPLY_PROP_STATUS: @@ -425,8 +426,7 @@ static int charger_get_property(struct power_supply *psy, val->intval = 0; break; case POWER_SUPPLY_PROP_VOLTAGE_NOW: - ret = get_batt_uV(cm, &i); - val->intval = i; + ret = get_batt_uV(cm, &val->intval); break; case POWER_SUPPLY_PROP_CURRENT_NOW: ret = cm->fuel_gauge->get_property(cm->fuel_gauge,