diff options
| author | Gerrit <chrome-bot@google.com> | 2012-04-30 09:31:13 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-04-30 09:31:13 -0700 |
| commit | a5027ece4cb02a736db3db1e971bffd699422dec (patch) | |
| tree | 5232cc8910c58e852a484f68f89a3f5c3b01e843 | |
| parent | a017e303614101dbd4da26ed18eee6e5c3b597c6 (diff) | |
| parent | 0a7701be57da9d1653382530bd81aaca64dea511 (diff) | |
| download | chrome-ec-a5027ece4cb02a736db3db1e971bffd699422dec.tar.gz | |
Merge "Prevent issuing warning when fan is off"
| -rw-r--r-- | chip/lm4/pwm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chip/lm4/pwm.c b/chip/lm4/pwm.c index d5082b54e9..62bd08a571 100644 --- a/chip/lm4/pwm.c +++ b/chip/lm4/pwm.c @@ -132,7 +132,8 @@ static void update_lpc_mapped_memory(void) static void check_fan_failure(void) { - if ((LM4_FAN_FANCTL & (1 << FAN_CH_CPU)) && + if (pwm_get_fan_target_rpm() != 0 && + (LM4_FAN_FANCTL & (1 << FAN_CH_CPU)) && ((LM4_FAN_FANSTS >> (2 * FAN_CH_CPU)) & 0x03) == 0) { /* Fan enabled but stalled. Issues warning. * As we have thermal shutdown protection, issuing warning |