diff options
| author | Andreas Herrmann <andreas.herrmann3@amd.com> | 2012-03-23 10:02:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 09:27:18 -0700 |
| commit | 7d088dca7920bc7c5d74d6c430699abb63ec0151 (patch) | |
| tree | d0682054467cac73ef7fbb5f9f2eced5c2efe27c /drivers/hwmon | |
| parent | a714cb9d0897be6e18fbc801a908cab483358946 (diff) | |
| download | kernel_samsung_smdk4412-7d088dca7920bc7c5d74d6c430699abb63ec0151.zip kernel_samsung_smdk4412-7d088dca7920bc7c5d74d6c430699abb63ec0151.tar.gz kernel_samsung_smdk4412-7d088dca7920bc7c5d74d6c430699abb63ec0151.tar.bz2 | |
hwmon: (fam15h_power) Correct sign extension of running_avg_capture
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>
Diffstat (limited to 'drivers/hwmon')
| -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 523f8fb..930370d 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), |