From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <200510290047.j9T0lMmf030111@shell0.pdx.osdl.net> To: paulus@samba.org From: akpm@osdl.org Date: Fri, 28 Oct 2005 17:46:51 -0700 Cc: akpm@osdl.org, linuxppc-dev@ozlabs.org, olh@suse.de, linuxppc64-dev@ozlabs.org Subject: [patch 36/43] ppc64: AC Power handling broken for desktops List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Olaf Hering Currently, AC Power is 0 on a desktop G4. No batteries present should mean AC Power == 1. Signed-off-by: Olaf Hering Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton --- drivers/macintosh/apm_emu.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff -puN drivers/macintosh/apm_emu.c~ppc64-ac-power-handling-broken-for-desktops drivers/macintosh/apm_emu.c --- devel/drivers/macintosh/apm_emu.c~ppc64-ac-power-handling-broken-for-desktops 2005-10-28 17:44:04.000000000 -0700 +++ devel-akpm/drivers/macintosh/apm_emu.c 2005-10-28 17:44:04.000000000 -0700 @@ -430,8 +430,8 @@ static int apm_emu_get_info(char *buf, c -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, c ac_line_status = ((pmu_power_flags & PMU_PWR_AC_PRESENT) != 0); for (i=0; i