summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_temp.c
diff options
context:
space:
mode:
authorFrancisco Jerez2010-09-23 17:01:05 +0200
committerBen Skeggs2010-09-24 08:29:19 +0200
commit67e1d4fbaefd6a27b55523bb6bb0dd941351a325 (patch)
tree8eb3d4a2510d9199fc0c8e4b0dd619c53bce7096 /drivers/gpu/drm/nouveau/nouveau_temp.c
parentdrm/nouveau: Add sane sensor correction defaults for nv4a. (diff)
downloadkernel-qcow2-linux-67e1d4fbaefd6a27b55523bb6bb0dd941351a325.tar.gz
kernel-qcow2-linux-67e1d4fbaefd6a27b55523bb6bb0dd941351a325.tar.xz
kernel-qcow2-linux-67e1d4fbaefd6a27b55523bb6bb0dd941351a325.zip
drm/nouveau: Fix parsing of the temperature constant correction.
Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_temp.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_temp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c
index 54e3d9222f79..86b170a851be 100644
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c
@@ -113,8 +113,8 @@ nouveau_temp_vbios_parse(struct drm_device *dev, u8 *temp)
switch (temp[0]) {
case 0x01:
- value = (value&0x8f) == 0 ? (value >> 9) & 0x7f : 0;
- sensor->offset_constant = value;
+ if ((value & 0x8f) == 0)
+ sensor->offset_constant = (value >> 9) & 0x7f;
break;
case 0x04: