diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-02-22 14:50:51 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-02-27 03:36:36 +0000 |
| commit | fdcd7eb86e4387e31549fa8bd00d437c0080b80c (patch) | |
| tree | 569502257a14640c96a853c9d5c40cd89ea25b72 | |
| parent | baf4dd433a0ebe7d9629909f75847d77e394770c (diff) | |
| download | chrome-ec-fdcd7eb86e4387e31549fa8bd00d437c0080b80c.tar.gz | |
npcx/fan: Avoid turning on disabled fans
Fan enable state is controlled in common/fan.c. This patch prevents
npcx fan driver from enabling it.
BUG=b:73127788
BRANCH=none
TEST=Verify no 'Fan 0 stalled' is printed in S3 and S5. Verify the
fan spins in S0.
Change-Id: I549253a64c91d8a23bb793c3506b5daf1f7642be
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/938324
| -rw-r--r-- | chip/npcx/fan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chip/npcx/fan.c b/chip/npcx/fan.c index ca0980a91a..8e08e4ec58 100644 --- a/chip/npcx/fan.c +++ b/chip/npcx/fan.c @@ -346,8 +346,11 @@ void fan_tick_func(void) /* Make sure rpm mode is enabled */ if (p_status->fan_mode != TACHO_FAN_RPM) { p_status->auto_status = FAN_STATUS_STOPPED; + /* Why isn't this 'continue'? */ return; } + if (!fan_get_enabled(ch)) + continue; /* Get actual rpm */ p_status->rpm_actual = mft_fan_rpm(ch); /* Do smart fan stuff */ |