From 7825c094532fe425e8bc01e436aa0f931db2356b Mon Sep 17 00:00:00 2001 From: Philip Rakity Date: Fri, 2 Sep 2011 04:20:01 +0200 Subject: [PATCH] --- yaml --- r: 283455 b: refs/heads/master c: 00a159a5567232fbe1dd85bc611c55f53943b0fc h: refs/heads/master i: 283453: a925bbd84c265a303c604cfae8e1bbc8ae9746ea 283451: a5473a1634d021a20bcfb3b6d8528d3057e80b24 283447: a63202c1b6b8805ba264a965c97e6d6fae446455 283439: 6ce488dead23e54ca3d6cb5e28f060b2e3fa0181 283423: 274726349117cf35e4557429151ca0ec82848180 283391: c0cafdedf4c03c8b23a8a76ce750d9b0ca2b7f27 v: v3 --- [refs] | 2 +- trunk/drivers/power/max8925_power.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f29672f32cab..09c0196e04e3 100644 --- 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 index d87032afcb5a..815525094ff9 100644 --- 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) { /*