From 7b9b55d5c174750dfa433939c546dd7562f0ef90 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olh@suse.de>
Date: Fri, 28 Oct 2005 17:46:51 -0700
Subject: [PATCH] --- yaml --- r: 11731 b: refs/heads/master c:
 08124f958997ac14bb2284af787752125a892e9f h: refs/heads/master i:   11729:
 14166273955acd15d0eb79f42efbdc5bc3cb236e   11727:
 333800865bdd38755a232afef8f85dc0a1cbbde4 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/macintosh/apm_emu.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 608e7a4be882..a084ac57639b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e658118faa9faf71f8a8295cdaeb7ca71c04672
+refs/heads/master: 08124f958997ac14bb2284af787752125a892e9f
diff --git a/trunk/drivers/macintosh/apm_emu.c b/trunk/drivers/macintosh/apm_emu.c
index 19d3e05d6825..e5a2bbf99399 100644
--- a/trunk/drivers/macintosh/apm_emu.c
+++ b/trunk/drivers/macintosh/apm_emu.c
@@ -430,8 +430,8 @@ static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length)
 	      -1: Unknown
 	   8) min = minutes; sec = seconds */
 
-	unsigned short  ac_line_status = 0xff;
-	unsigned short  battery_status = 0xff;
+	unsigned short  ac_line_status;
+	unsigned short  battery_status = 0;
 	unsigned short  battery_flag   = 0xff;
 	int		percentage     = -1;
 	int             time_units     = -1;
@@ -446,6 +446,7 @@ static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length)
 	ac_line_status = ((pmu_power_flags & PMU_PWR_AC_PRESENT) != 0);
 	for (i=0; i<pmu_battery_count; i++) {
 		if (pmu_batteries[i].flags & PMU_BATT_PRESENT) {
+			battery_status++;
 			if (percentage < 0)
 				percentage = 0;
 			if (charge < 0)
@@ -461,6 +462,9 @@ static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length)
 				charging++;
 		}
 	}
+	if (0 == battery_status)
+		ac_line_status = 1;
+	battery_status = 0xff;
 	if (real_count) {
 		if (amperage < 0) {
 			if (btype == PMU_BATT_TYPE_SMART)