---

yaml --- r: 367463 b: refs/heads/master c: 54fbbb6 h: refs/heads/master i: 367461: 52ae20e 367459: b068e01 367455: ad732e7 v: v3
git-mirror · Mar 7, 2013 · bc11d0b · bc11d0b
1 parent efd52ab
commit bc11d0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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");