---

yaml --- r: 283455 b: refs/heads/master c: 00a159a h: refs/heads/master i: 283453: a925bbd 283451: a5473a1 283447: a63202c 283439: 6ce488d 283423: 2747263 283391: c0cafde v: v3
git-mirror · Nov 26, 2011 · 7825c09 · 7825c09
1 parent fcd6cc7
commit 7825c09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b57f2f6108fbf9ce33191fb574fe94b1f3ccbff3
+refs/heads/master: 00a159a5567232fbe1dd85bc611c55f53943b0fc
diff --git a/trunk/drivers/power/max8925_power.c b/trunk/drivers/power/max8925_power.c
@@ -377,9 +377,15 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip,
 	REQUEST_IRQ(MAX8925_IRQ_VCHG_TOPOFF, "charger-topoff");
 	REQUEST_IRQ(MAX8925_IRQ_VCHG_TMR_FAULT, "charger-timer-expire");
 
-	info->ac_online = 0;
 	info->usb_online = 0;
 	info->bat_online = 0;
+
+	/* check for power - can miss interrupt at boot time */
+	if (start_measure(info, MEASURE_VCHG) * 2000 > 500000)
+		info->ac_online = 1;
+	else
+		info->ac_online = 0;
+
 	ret = max8925_reg_read(info->gpm, MAX8925_CHG_STATUS);
 	if (ret >= 0) {
 		/*