---

yaml --- r: 361530 b: refs/heads/master c: bf55eb8 h: refs/heads/master v: v3
git-mirror · Mar 18, 2013 · 03c5a74 · 03c5a74
1 parent 20aba00
commit 03c5a74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98ee7c7c63f16e443f51abf08e5412f8eb44ad1e
+refs/heads/master: bf55eb843d266ad31696f17cf1f5c237409485cf
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c b/trunk/drivers/gpu/drm/nouveau/core/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);