---

yaml --- r: 315965 b: refs/heads/master c: 62867d4 h: refs/heads/master i: 315963: 0e88d12 v: v3
git-mirror · Jul 22, 2012 · f956ef4 · f956ef4
1 parent 86ed0c0
commit f956ef4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58c3667d83376c2f3016465f59f22c19c8f846e1
+refs/heads/master: 62867d491a27affee36194d4856564f2f4e12b3c
diff --git a/trunk/drivers/hwmon/fam15h_power.c b/trunk/drivers/hwmon/fam15h_power.c
@@ -67,7 +67,8 @@ static ssize_t show_power(struct device *dev,
 				  REG_TDP_LIMIT3, &val);
 
 	tdp_limit = val >> 16;
-	curr_pwr_watts = (tdp_limit + data->base_tdp) << running_avg_range;
+	curr_pwr_watts = ((u64)(tdp_limit +
+				data->base_tdp)) << running_avg_range;
 	curr_pwr_watts -= running_avg_capture;
 	curr_pwr_watts *= data->tdp_to_watts;