From f956ef430e9a8fd99c7652c08765200352e608b7 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Thu, 21 Jun 2012 06:26:12 -0700 Subject: [PATCH] --- yaml --- r: 315965 b: refs/heads/master c: 62867d491a27affee36194d4856564f2f4e12b3c h: refs/heads/master i: 315963: 0e88d12fac19509c8111da03cd6e7caa474facb1 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/fam15h_power.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a774295a36e2..6659ff679283 100644 --- 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 index 6b13f1a4dc27..2764b78a784b 100644 --- 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;