battery: bug fix regarding pm_lock_internal() check

Change-Id: Ic119e32dfe3513910dcb2660e26ab2a25dade34c
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index f42b8aa..bf09758 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -750,20 +750,20 @@ static void update_battery_cycle(void)
 static void process_power_supply(void *data)
 {
        bool broadcasted = true;
-       int lock = -1;
+       int ret_lock = -1;
        int ret_val;
 
        _D("process_power_supply()");
-       if (disp_plgn->pm_lock_internal) {
-               lock = disp_plgn->pm_lock_internal(INTERNAL_LOCK_BATTERY, LCD_OFF, STAY_CUR_STATE, 0);
+       if (disp_plgn->pm_lock_internal)
+               ret_lock = disp_plgn->pm_lock_internal(INTERNAL_LOCK_BATTERY, LCD_OFF, STAY_CUR_STATE, 0);
+
        if (old_battery.charge_now != battery.charge_now || battery.charge_now == CHARGER_ABNORMAL) {
-                       ret_val = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, battery.charge_now);
-                       if (ret_val < 0)
-                               _E("Failed to set vconf value for battery charge now: %d", vconf_get_ext_errno());
+               ret_val = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, battery.charge_now);
+               if (ret_val < 0)
+                       _E("Failed to set vconf value for battery charge now: %d", vconf_get_ext_errno());
 
-                       if (power_supply_broadcast(CHARGE_NOW_SIGNAL, battery.charge_now) < 0)
-                               broadcasted = false;
-               }
+               if (power_supply_broadcast(CHARGE_NOW_SIGNAL, battery.charge_now) < 0)
+                       broadcasted = false;
        }
 
        if (!strcmp(old_battery.status_s, CHARGEFULL_NAME) &&
@@ -860,9 +860,11 @@ static void process_power_supply(void *data)
        }
        update_capacity_full();
        update_battery_cycle();
-       if (lock == 0) {
-               if (disp_plgn->pm_unlock_internal)
+
+       if (disp_plgn->pm_unlock_internal) {
+               if (ret_lock == 0) {
                        disp_plgn->pm_unlock_internal(INTERNAL_LOCK_BATTERY, LCD_OFF, PM_SLEEP_MARGIN);
+               }
        }
 }