From bc11d0b7430aa85cfafac45cd8776ca6f56f3012 Mon Sep 17 00:00:00 2001 From: Per Forlin Date: Thu, 5 Jul 2012 16:52:55 +0200 Subject: [PATCH] --- yaml --- r: 367463 b: refs/heads/master c: 54fbbb6242247d06d21e21bbcf4ae8339bd75592 h: refs/heads/master i: 367461: 52ae20e85ce2412b485de316e5220b5b579499fe 367459: b068e01c9194d1f573e7dc22fada303761cd82dd 367455: ad732e7e434bb49d9fc43f1c989308ebe8144b72 v: v3 --- [refs] | 2 +- trunk/drivers/power/pm2301_charger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c1bfd244de65..db3dfe748524 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8891716e24d7b0f4b1c3b4fdff641bcb1fb282c4 +refs/heads/master: 54fbbb6242247d06d21e21bbcf4ae8339bd75592 diff --git a/trunk/drivers/power/pm2301_charger.c b/trunk/drivers/power/pm2301_charger.c index 45ef3b9de6b9..3f02636c48a5 100644 --- a/trunk/drivers/power/pm2301_charger.c +++ b/trunk/drivers/power/pm2301_charger.c @@ -1067,6 +1067,8 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, pm2xxx_reg_read(pm2, PM2XXX_REG_INT2, &val); pm2xxx_reg_read(pm2, PM2XXX_REG_INT4, &val); pm2->ac.charger_connected = 1; + ab8500_override_turn_on_stat(~AB8500_POW_KEY_1_ON, + AB8500_MAIN_CH_DET); pm2->ac_conn = true; power_supply_changed(&pm2->ac_chg.psy); sysfs_notify(&pm2->ac_chg.psy.dev->kobj, NULL, "present");