diff options
| author | Martin Peres <martin.peres@labri.fr> | 2013-03-15 02:09:20 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-03-18 11:14:07 +1000 |
| commit | 1a60c01a7f68479f00a5893999af3a40c028b4a3 (patch) | |
| tree | a685e7a3f3a7b1d7e22e4c0f57a33f862c617cb9 | |
| parent | ec72ba46e644f8ae0fad6432b1e70f2763e1dba0 (diff) | |
| download | nouveau-1a60c01a7f68479f00a5893999af3a40c028b4a3.tar.gz | |
nv40/therm: reserve negative temperatures for errors
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | nvkm/subdev/therm/nv40.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nvkm/subdev/therm/nv40.c b/nvkm/subdev/therm/nv40.c index c526d5364..a70d1b7e3 100644 --- a/nvkm/subdev/therm/nv40.c +++ b/nvkm/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; } |