Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 6d02e3b06375..d76f0b70c6e0 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -365,12 +365,12 @@ static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
                 if (cpu_has_tjmax(c))
                         dev_warn(dev, "Unable to read TjMax from CPU %u\n", id);
         } else {
-                val = (eax >> 16) & 0x7f;
+                val = (eax >> 16) & 0xff;
                 /*
                  * If the TjMax is not plausible, an assumption
                  * will be used
                  */
-                if (val >= 85) {
+                if (val) {
                         dev_dbg(dev, "TjMax is %d degrees C\n", val);
                         return val * 1000;
                 }