commit dbcef09329387c143e238b834ca9388722da6541
author David Keitel <dkeitel@codeaurora.org> Tue May 14 14:48:30 2013 -0700
committer David Keitel <dkeitel@codeaurora.org> Thu May 16 09:54:10 2013 -0700
tree a79d837e718994abaf244e3d5b67e19deb719bab
parent e53d7ab1442bdcd227c6c99dd4d1700bd17ed68f

power: qpnp-charger.c: check power supply change calls

Make sure that a power supply is initialized before
calling power_supply_changed on a particular supply.

This fixes a possible bad magic bug when the power
supply framework tries to schedule the work queue.

Change-Id: Ie9d071208af93144a647047cf0c6d3ae9b94f4c2
Signed-off-by: David Keitel <dkeitel@codeaurora.org>

drivers/power/qpnp-charger.c

diff --git a/drivers/power/qpnp-charger.c b/drivers/power/qpnp-charger.c
index 5a0441b..10a9fcc 100644
--- a/drivers/power/qpnp-charger.c
+++ b/drivers/power/qpnp-charger.c
@@ -680,8 +680,10 @@
 	}
 
 	power_supply_changed(chip->usb_psy);
-	power_supply_changed(&chip->dc_psy);
-	power_supply_changed(&chip->batt_psy);
+	if (chip->dc_chgpth_base)
+		power_supply_changed(&chip->dc_psy);
+	if (chip->bat_if_base)
+		power_supply_changed(&chip->batt_psy);
 	return IRQ_HANDLED;
 }
 
@@ -796,9 +798,11 @@
 	if (rc)
 		pr_err("Failed to write chg_fail clear bit!\n");
 
-	power_supply_changed(&chip->batt_psy);
+	if (chip->bat_if_base)
+		power_supply_changed(&chip->batt_psy);
 	power_supply_changed(chip->usb_psy);
-	power_supply_changed(&chip->dc_psy);
+	if (chip->dc_chgpth_base)
+		power_supply_changed(&chip->dc_psy);
 	return IRQ_HANDLED;
 }
 
@@ -810,7 +814,8 @@
 	pr_debug("TRKL IRQ triggered\n");
 
 	chip->chg_done = false;
-	power_supply_changed(&chip->batt_psy);
+	if (chip->bat_if_base)
+		power_supply_changed(&chip->batt_psy);
 
 	return IRQ_HANDLED;
 }
@@ -822,9 +827,11 @@
 
 	pr_debug("FAST_CHG IRQ triggered\n");
 	chip->chg_done = false;
-	power_supply_changed(&chip->batt_psy);
+	if (chip->bat_if_base)
+		power_supply_changed(&chip->batt_psy);
 	power_supply_changed(chip->usb_psy);
-	power_supply_changed(&chip->dc_psy);
+	if (chip->dc_chgpth_base)
+		power_supply_changed(&chip->dc_psy);
 	enable_irq(chip->chg_vbatdet_lo_irq);
 
 	return IRQ_HANDLED;