aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/w83627ehf.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-11-04 07:00:47 -0400
committerJean Delvare <khali@endymion.delvare>2011-11-04 07:00:47 -0400
commit2265cef2751b3441df91f85e0107f9f549e5b711 (patch)
tree9ae2f2f9eba97f987237eae5ffbf787ec6b4fb1e /drivers/hwmon/w83627ehf.c
parent90f4102ce59226954edbe960b2434d8b3da5f086 (diff)
hwmon: (w83627ehf) Properly report PECI and AMD-SI sensor types
When temperature sources are PECI or AMD-SI agents, it makes no sense to report their type as diode or thermistor. Instead we must report their digital nature. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: stable@kernel.org Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'drivers/hwmon/w83627ehf.c')
-rw-r--r--drivers/hwmon/w83627ehf.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 98aab4bea342..9354f9541313 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1812,7 +1812,14 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
1812 diode = 0x70; 1812 diode = 0x70;
1813 } 1813 }
1814 for (i = 0; i < 3; i++) { 1814 for (i = 0; i < 3; i++) {
1815 if ((tmp & (0x02 << i))) 1815 const char *label = data->temp_label[data->temp_src[i]];
1816
1817 /* Digital source overrides analog type */
1818 if (strncmp(label, "PECI", 4) == 0)
1819 data->temp_type[i] = 6;
1820 else if (strncmp(label, "AMD", 3) == 0)
1821 data->temp_type[i] = 5;
1822 else if ((tmp & (0x02 << i)))
1816 data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3; 1823 data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;
1817 else 1824 else
1818 data->temp_type[i] = 4; /* thermistor */ 1825 data->temp_type[i] = 4; /* thermistor */