DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm_charger: Fix race condition with battery supply

Browse Source 
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
This commit is contained in:
Michael Bohan
2011-10-05 11:38:25 -07:00
committed by Bryan Huntsman
parent dc6f0198ef
commit 2f090af83e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/power/msm_charger.c
View File

@@ -993,8 +993,6 @@ void msm_charger_vbus_draw(unsigned int mA)
static int __init determine_initial_batt_status(void) static int __init determine_initial_batt_status(void)
{ {
int rc;
if (is_battery_present()) if (is_battery_present())
if (is_battery_id_valid()) if (is_battery_id_valid())
if (is_battery_temp_within_range()) if (is_battery_temp_within_range())
@@ -1010,13 +1008,6 @@ static int __init determine_initial_batt_status(void)
if (is_batt_status_capable_of_charging()) if (is_batt_status_capable_of_charging())
handle_battery_inserted(); handle_battery_inserted();
rc = power_supply_register(msm_chg.dev, &msm_psy_batt);
if (rc < 0) {
dev_err(msm_chg.dev, "%s: power_supply_register failed"
" rc=%d\n", __func__, rc);
return rc;
}
/* start updaing the battery powersupply every msm_chg.update_time /* start updaing the battery powersupply every msm_chg.update_time
* milliseconds */ * milliseconds */
queue_delayed_work(msm_chg.event_wq_thread, queue_delayed_work(msm_chg.event_wq_thread,
@@ -1156,11 +1147,20 @@ EXPORT_SYMBOL(msm_charger_register);
void msm_battery_gauge_register(struct msm_battery_gauge *batt_gauge) void msm_battery_gauge_register(struct msm_battery_gauge *batt_gauge)
{ {
int rc;
if (msm_batt_gauge) { if (msm_batt_gauge) {
msm_batt_gauge = batt_gauge; msm_batt_gauge = batt_gauge;
pr_err("msm-charger %s multiple battery gauge called\n", pr_err("msm-charger %s multiple battery gauge called\n",
__func__); __func__);
} else { } else {
rc = power_supply_register(msm_chg.dev, &msm_psy_batt);
if (rc < 0) {
dev_err(msm_chg.dev, "%s: power_supply_register failed"
" rc=%d\n", __func__, rc);
return;
}
msm_batt_gauge = batt_gauge; msm_batt_gauge = batt_gauge;
determine_initial_batt_status(); determine_initial_batt_status();
} }