summaryrefslogtreecommitdiff
path: root/nvkm
diff options
context:
space:
mode:
authorMartin Peres <martin.peres@labri.fr>2013-03-15 00:42:38 +0100
committerBen Skeggs <bskeggs@redhat.com>2013-03-18 11:14:15 +1000
commitac9c59a7fe35a8fd69e5d33329b97706ae8d81b5 (patch)
tree90011d55ceebae0c39e3edd8218fe2583d4af67f /nvkm
parent49332133a26c459de56785aded6f207b920b3fcb (diff)
downloadnouveau-ac9c59a7fe35a8fd69e5d33329b97706ae8d81b5.tar.gz
therm: disable temperature management if the sensor isn't readable
Signed-off-by: Martin Peres <martin.peres@labri.fr> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm')
-rw-r--r--nvkm/subdev/therm/temp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nvkm/subdev/therm/temp.c b/nvkm/subdev/therm/temp.c
index 0d94d1a19..2a02c9f1d 100644
--- a/nvkm/subdev/therm/temp.c
+++ b/nvkm/subdev/therm/temp.c
@@ -193,7 +193,7 @@ alarm_timer_callback(struct nouveau_alarm *alarm)
NOUVEAU_THERM_THRS_SHUTDOWN);
/* schedule the next poll in one second */
- if (list_empty(&alarm->head))
+ if (therm->temp_get(therm) >= 0 && list_empty(&alarm->head))
ptimer->alarm(ptimer, 1000 * 1000 * 1000, alarm);
spin_unlock_irqrestore(&priv->sensor.alarm_program_lock, flags);