From 6182e8b704c704bf06d61942bcea7a82d283cc1d Mon Sep 17 00:00:00 2001 From: nwhitehorn Date: Sat, 28 May 2011 21:54:18 +0000 Subject: Require an error instead of a timeout to decide the new-style fan commands won't work. This prevents a busy system from making smu(4) suddenly decide its fans use the old-style command set. MFC after: 3 days --- sys/powerpc/powermac/smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/powerpc/powermac/smu.c') diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c index 9041b30..09025b1 100644 --- a/sys/powerpc/powermac/smu.c +++ b/sys/powerpc/powermac/smu.c @@ -662,7 +662,7 @@ smu_fan_set_rpm(struct smu_fan *fan, int rpm) cmd.data[3] = rpm & 0xff; error = smu_run_cmd(smu, &cmd, 1); - if (error) + if (error && error != EWOULDBLOCK) fan->old_style = 1; } @@ -695,7 +695,7 @@ smu_fan_read_rpm(struct smu_fan *fan) cmd.data[1] = fan->reg; error = smu_run_cmd(smu, &cmd, 1); - if (error) + if (error && error != EWOULDBLOCK) fan->old_style = 1; rpm = (cmd.data[0] << 8) | cmd.data[1]; -- cgit v1.1