summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2014-03-24 13:34:47 +1000
committerBen Skeggs <bskeggs@redhat.com>2014-03-26 14:08:22 +1000
commitdcd9262b3baf881285e9e0fd5459d54723cc992e (patch)
tree20317a4bad17a254c13d58f6c4d0d6a2075e8957 /drivers/gpu/drm/nouveau
parentcbc53c167921a5c86ab8fcbf41c101da741dab7d (diff)
downloadblackbird-op-linux-dcd9262b3baf881285e9e0fd5459d54723cc992e.tar.gz
blackbird-op-linux-dcd9262b3baf881285e9e0fd5459d54723cc992e.zip
drm/nouveau/therm: check for sensor presence with requested mode, not current
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/therm/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
index 80e584a1bd1c..fd1b4606e22b 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
@@ -179,7 +179,7 @@ nouveau_therm_fan_mode(struct nouveau_therm *therm, int mode)
/* do not allow automatic fan management if the thermal sensor is
* not available */
- if (priv->mode == NOUVEAU_THERM_CTRL_AUTO && therm->temp_get(therm) < 0)
+ if (mode == NOUVEAU_THERM_CTRL_AUTO && therm->temp_get(therm) < 0)
return -EINVAL;
if (priv->mode == mode)
OpenPOWER on IntegriCloud