From: Andreas Herrmann Date: Fri, 23 Mar 2012 09:02:17 +0000 (+0100) Subject: hwmon: (fam15h_power) Correct sign extension of running_avg_capture X-Git-Tag: v2.6.39-400.9.0~518 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=43f3b8d78f82ef86dbfff0aa87609ff53e855372;p=users%2Fjedix%2Flinux-maple.git hwmon: (fam15h_power) Correct sign extension of running_avg_capture Wrong bit was used for sign extension which caused wrong end results. Thanks to Andre for spotting this bug. Reported-by: Andre Przywara Signed-off-by: Andreas Herrmann Acked-by: Guenter Roeck Signed-off-by: Jean Delvare Cc: stable@vger.kernel.org Conflicts: drivers/hwmon/fam15h_power.c --- diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index d3910fece0c5..37a8fc92b44a 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -60,7 +60,7 @@ static ssize_t show_power(struct device *dev, pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), REG_TDP_RUNNING_AVERAGE, &val); running_avg_capture = (val >> 4) & 0x3fffff; - running_avg_capture = sign_extend32(running_avg_capture, 22); + running_avg_capture = sign_extend32(running_avg_capture, 21); running_avg_range = (val & 0xf) + 1; pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),