]> www.infradead.org Git - users/jedix/linux-maple.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)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 18 Jun 2012 08:40:06 +0000 (12:40 +0400)
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>
Cc: stable@vger.kernel.org
Conflicts:

drivers/hwmon/fam15h_power.c

drivers/hwmon/fam15h_power.c

index d3910fece0c5d50f6d64cce364dba427bc9645d5..37a8fc92b44acf50a16d086c9983a9794c03b838 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) + 1;
 
        pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),