| From fc0900cbda9243957d812cd6b4cc87965f9fe75f Mon Sep 17 00:00:00 2001 |
| From: Andreas Herrmann <andreas.herrmann3@amd.com> |
| Date: Fri, 23 Mar 2012 10:02:17 +0100 |
| Subject: hwmon: (fam15h_power) Correct sign extension of running_avg_capture |
| |
| From: Andreas Herrmann <andreas.herrmann3@amd.com> |
| |
| 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 <andre.przywara@amd.com> |
| Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com> |
| Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> |
| Signed-off-by: Jean Delvare <khali@linux-fr.org> |
| 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), |
