[ 119/175] hwmon: (fam15h_power) Correct sign extension of running_avg_capture
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-03-30 21:26:04
Also in:
lkml
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-03-30 21:26:04
Also in:
lkml
3.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andreas Herrmann <redacted> commit fc0900cbda9243957d812cd6b4cc87965f9fe75f upstream. Wrong bit was used for sign extension which caused wrong end results. Thanks to Andre for spotting this bug. Reported-by: Andre Przywara <redacted> Signed-off-by: Andreas Herrmann <redacted> Acked-by: Guenter Roeck <redacted> Signed-off-by: Jean Delvare <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/hwmon/fam15h_power.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c@@ -60,7 +60,7 @@ static ssize_t show_power(struct device 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; pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),