* [PATCH] ppc32: Fix warning in pmac battery code
@ 2004-09-24 5:42 Benjamin Herrenschmidt
0 siblings, 0 replies; only message in thread
From: Benjamin Herrenschmidt @ 2004-09-24 5:42 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linus Torvalds, Linux Kernel list
Hi !
The battery calculation code in via-pmu triggers a few warnings
(and actually, one of them would lead to a real error if we ever
get an unrecognized type from the PMU). Fix this.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
diff -urN linux-2.5/drivers/macintosh/via-pmu.c linux-lappy/drivers/macintosh/via-pmu.c
--- linux-2.5/drivers/macintosh/via-pmu.c 2004-09-24 14:34:05.000000000 +1000
+++ linux-lappy/drivers/macintosh/via-pmu.c 2004-09-24 14:45:46.000000000 +1000
@@ -747,6 +747,8 @@
pmu_power_flags &= ~PMU_PWR_AC_PRESENT;
+ capa = max = amperage = voltage = 0;
+
if (req->reply[1] & 0x04) {
bat_flags |= PMU_BATT_PRESENT;
switch(req->reply[0]) {
@@ -766,8 +768,7 @@
req->reply_len, req->reply[0], req->reply[1], req->reply[2], req->reply[3]);
break;
}
- } else
- capa = max = amperage = voltage = 0;
+ }
if ((req->reply[1] & 0x01) && (amperage > 0))
bat_flags |= PMU_BATT_CHARGING;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-09-24 5:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-09-24 5:42 [PATCH] ppc32: Fix warning in pmac battery code Benjamin Herrenschmidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®