---

yaml --- r: 330487 b: refs/heads/master c: fd65ee5 h: refs/heads/master i: 330485: 949f717 330483: 14f46cb 330479: ae4ceb0 v: v3
git-mirror · Aug 23, 2012 · 32b1ff7 · 32b1ff7
1 parent 934a44b
commit 32b1ff7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;