]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
hwmon: (fam15h_power) Correct sign extension of running_avg_capture
authorAndreas Herrmann <andreas.herrmann3@amd.com>
Fri, 23 Mar 2012 09:02:17 +0000 (10:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Apr 2012 16:27:18 +0000 (09:27 -0700)
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

index 523f8fb9e7d92402f1fa1b6ead69766fb428430a..930370de5201b66e38e4e82d74c89d3ae45a0413 100644 (file)
@@ -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;
 
        pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),