--- ds2784_battery_orig.c	2010-11-19 08:32:14.000000000 -0800
+++ ds2784_battery.c	2010-11-21 16:28:15.959946901 -0800
@@ -789,6 +789,19 @@
 	/* shut off charger when full:
 	 * - CHGTF flag is set
 	 */
+
+	/* Changed this code if-statement back to stock because this
+	 * parameter is now user settable by changing the actual
+       * register value inside the battery chip EEPROM.
+	 * --RP
+	 */
+
+	if ((di->status.status_reg & 0x80) &&
+		(di->status.percentage == 100)) {
+		di->status.battery_full = 1;
+		charge_mode = CHARGE_BATT_DISABLE;
+	}
+
 	/* We don't move from full to not-full until
 	 * we drop below 95%, to avoid confusing the
 	 * user while we're maintaining a full charge
@@ -806,19 +819,6 @@
 		di->status.battery_full = 0;
 	}

-	/* Changed this code if-statement back to stock because this
-	 * parameter is now user settable by changing the actual
-       * register value inside the battery chip EEPROM.
-	 * --RP
-	 */
-
-	if (di->status.status_reg & 0x80) {
-		di->status.battery_full = 1;
-		charge_mode = CHARGE_BATT_DISABLE;
-	}
-	else
-		di->status.battery_full = 0;
-
 	if (temp >= TEMP_HOT) {
 		if (temp >= TEMP_CRITICAL)
 			charge_mode = CHARGE_BATT_DISABLE;