From 6a9024f713de9e543f907127dbc455814ee4ed18 Mon Sep 17 00:00:00 2001 From: Ramakrishna Pallala Date: Thu, 16 Dec 2010 07:13:35 +0530 Subject: [PATCH] Update disconnect status function modified Signed-off-by: Ramakrishna Pallala --- drivers/power/intel_mdf_battery.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/power/intel_mdf_battery.c b/drivers/power/intel_mdf_battery.c index ed6eff5..baa1917 100644 --- a/drivers/power/intel_mdf_battery.c +++ b/drivers/power/intel_mdf_battery.c @@ -1567,14 +1567,9 @@ static void reset_wdt_timer(struct msic_power_module_info *mbi) msic_write_multi(mbi, address, data, 2); } -static void msic_update_disconn_status(struct msic_power_module_info *mbi) +static void msic_update_disconn_status(struct msic_power_module_info *mbi, + int event) { - int event; - - spin_lock(&mbi->event_lock); - event = mbi->batt_event; - spin_unlock(&mbi->event_lock); - mutex_lock(&mbi->usb_chrg_lock); mbi->usb_chrg_props.charger_health = POWER_SUPPLY_HEALTH_UNKNOWN; memcpy(mbi->usb_chrg_props.charger_model, "Unknown", sizeof("Unknown")); @@ -1898,7 +1893,7 @@ lbl_sched_work: static void msic_batt_disconn(struct work_struct *work) { - int ret; + int ret, event; struct msic_power_module_info *mbi = container_of(work, struct msic_power_module_info, disconn_handler.work); @@ -1907,7 +1902,12 @@ static void msic_batt_disconn(struct work_struct *work) dev_dbg(msic_dev, "%s: failed\n", __func__); return; } - msic_update_disconn_status(mbi); + + spin_lock(&mbi->event_lock); + event = mbi->batt_event; + spin_unlock(&mbi->event_lock); + + msic_update_disconn_status(mbi, event); } /** -- 1.7.2.3