aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/windfarm_pm112.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-03-03 01:03:21 -0500
committerPaul Mackerras <paulus@samba.org>2006-03-03 05:43:53 -0500
commitb55fafc5a800f27beedfdcf8bd1b6baa47e769a9 (patch)
treedc651c5738f20b72cb17ef3fc33e2e27977e6372 /drivers/macintosh/windfarm_pm112.c
parent0c2aca88bdac4254a13466fb108733d243a118b6 (diff)
[PATCH] powerpc: Fix old g5 issues with windfarm
Some of the windfarm sensor modules can initialize on old machines that don't have full windfarm support like non-dual core desktop G5s. Unfortunately, by doing so, they would trigger a bug in their matching algorithm causing them to attach to the wrong bus, thus triggering issues with the i2c core and breaking the thermal driver. This patch fixes the probing issue (so that they will work when a windfarm port is done to these machines) and also prevents for now windfarm to load at all on these machines that still use therm_pm72 to avoid wasting resources. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/macintosh/windfarm_pm112.c')
-rw-r--r--drivers/macintosh/windfarm_pm112.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/windfarm_pm112.c b/drivers/macintosh/windfarm_pm112.c
index c2a4e689c784..17aec8e7476f 100644
--- a/drivers/macintosh/windfarm_pm112.c
+++ b/drivers/macintosh/windfarm_pm112.c
@@ -613,7 +613,7 @@ static void pm112_new_sensor(struct wf_sensor *sr)
613 } else if (!strcmp(sr->name, "slots-power")) { 613 } else if (!strcmp(sr->name, "slots-power")) {
614 if (slots_power == NULL && wf_get_sensor(sr) == 0) 614 if (slots_power == NULL && wf_get_sensor(sr) == 0)
615 slots_power = sr; 615 slots_power = sr;
616 } else if (!strcmp(sr->name, "u4-temp")) { 616 } else if (!strcmp(sr->name, "backside-temp")) {
617 if (u4_temp == NULL && wf_get_sensor(sr) == 0) 617 if (u4_temp == NULL && wf_get_sensor(sr) == 0)
618 u4_temp = sr; 618 u4_temp = sr;
619 } else 619 } else