From d431eeafd5ae0c7e641dd56022970b85aa65f134 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 23 Sep 2010 17:01:05 +0200
Subject: [PATCH] --- yaml --- r: 218222 b: refs/heads/master c:
 67e1d4fbaefd6a27b55523bb6bb0dd941351a325 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_temp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ad081f086e57..9fd61f8f9035 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d34ec507d40faab908968985b3106869d8d8fbcf
+refs/heads/master: 67e1d4fbaefd6a27b55523bb6bb0dd941351a325
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_temp.c b/trunk/drivers/gpu/drm/nouveau/nouveau_temp.c
index 54e3d9222f79..86b170a851be 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/trunk/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: