diff options
| author | Andreas Herrmann <andreas.herrmann3@amd.com> | 2012-03-23 10:02:17 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2012-03-23 10:02:17 +0100 |
| commit | fc0900cbda9243957d812cd6b4cc87965f9fe75f (patch) | |
| tree | 3e0a3593a4d57704ae61380fec3667397b2429a6 /drivers/hwmon/fam15h_power.c | |
| parent | Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6 (diff) | |
| download | linux-fc0900cbda9243957d812cd6b4cc87965f9fe75f.tar.xz linux-fc0900cbda9243957d812cd6b4cc87965f9fe75f.zip | |
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 <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
Diffstat (limited to 'drivers/hwmon/fam15h_power.c')
| -rw-r--r-- | drivers/hwmon/fam15h_power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 523f8fb9e7d9..930370de5201 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; pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), |