From 32b1ff7f5d55b3170f76fa5eb7ff1e10e3a0927a Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Fri, 27 Jul 2012 14:01:37 +0900 Subject: [PATCH] --- yaml --- r: 330487 b: refs/heads/master c: fd65ee5f1c21af9ff9f113842d513ca50749ad68 h: refs/heads/master i: 330485: 949f7179a4cfa1f2e6a84a3001d1534181446695 330483: 14f46cb202d2d112555975ef44e23426530fcb1b 330479: ae4ceb076655a7b2e465dffd63b400083b32e33f v: v3 --- [refs] | 2 +- trunk/drivers/power/charger-manager.c | 2 +- trunk/include/linux/power/charger-manager.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fdfbe1521cbd..a7b7e8090662 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbb61fc7452632a4225b2fe3719b6c2d1306e257 +refs/heads/master: fd65ee5f1c21af9ff9f113842d513ca50749ad68 diff --git a/trunk/drivers/power/charger-manager.c b/trunk/drivers/power/charger-manager.c index 240de49934f1..cdf29d2eb7a5 100644 --- a/trunk/drivers/power/charger-manager.c +++ b/trunk/drivers/power/charger-manager.c @@ -415,7 +415,7 @@ static void fullbatt_vchk(struct work_struct *work) return; } - diff = cm->fullbatt_vchk_uV; + diff = desc->fullbatt_uV; diff -= batt_uV; dev_dbg(cm->dev, "VBATT dropped %duV after full-batt.\n", diff); diff --git a/trunk/include/linux/power/charger-manager.h b/trunk/include/linux/power/charger-manager.h index cd22029e32aa..7d7b90fb7b4b 100644 --- a/trunk/include/linux/power/charger-manager.h +++ b/trunk/include/linux/power/charger-manager.h @@ -194,8 +194,6 @@ struct charger_desc { * @charger_enabled: the state of charger * @fullbatt_vchk_jiffies_at: * jiffies at the time full battery check will occur. - * @fullbatt_vchk_uV: voltage in microvolt - * criteria for full battery * @fullbatt_vchk_work: work queue for full battery check * @emergency_stop: * When setting true, stop charging @@ -218,7 +216,6 @@ struct charger_manager { bool charger_enabled; unsigned long fullbatt_vchk_jiffies_at; - unsigned int fullbatt_vchk_uV; struct delayed_work fullbatt_vchk_work; int emergency_stop;