---

yaml --- r: 361528 b: refs/heads/master c: 76c0295 h: refs/heads/master v: v3
git-mirror · Mar 18, 2013 · 108b419 · 108b419
1 parent fe8a405
commit 108b419
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad40d73ef533ab0ad16b4a1ab2f7870c1f8ab954
+refs/heads/master: 76c0295c389ad9ba19b668b5974cdd90eb95788e
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c
@@ -102,6 +102,10 @@ nv40_temp_get(struct nouveau_therm *therm)
 	core_temp = core_temp + sensor->offset_num / sensor->offset_den;
 	core_temp = core_temp + sensor->offset_constant - 8;
 
+	/* reserve negative temperatures for errors */
+	if (core_temp < 0)
+		core_temp = 0;
+
 	return core_temp;
 }