diff options
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/it87.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index d793cc011990..b74c95735f95 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c | |||
@@ -477,7 +477,7 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *attr, | |||
477 | if (reg & (1 << nr)) | 477 | if (reg & (1 << nr)) |
478 | return sprintf(buf, "3\n"); /* thermal diode */ | 478 | return sprintf(buf, "3\n"); /* thermal diode */ |
479 | if (reg & (8 << nr)) | 479 | if (reg & (8 << nr)) |
480 | return sprintf(buf, "2\n"); /* thermistor */ | 480 | return sprintf(buf, "4\n"); /* thermistor */ |
481 | return sprintf(buf, "0\n"); /* disabled */ | 481 | return sprintf(buf, "0\n"); /* disabled */ |
482 | } | 482 | } |
483 | static ssize_t set_sensor(struct device *dev, struct device_attribute *attr, | 483 | static ssize_t set_sensor(struct device *dev, struct device_attribute *attr, |
@@ -493,10 +493,15 @@ static ssize_t set_sensor(struct device *dev, struct device_attribute *attr, | |||
493 | 493 | ||
494 | data->sensor &= ~(1 << nr); | 494 | data->sensor &= ~(1 << nr); |
495 | data->sensor &= ~(8 << nr); | 495 | data->sensor &= ~(8 << nr); |
496 | /* 3 = thermal diode; 2 = thermistor; 0 = disabled */ | 496 | if (val == 2) { /* backwards compatibility */ |
497 | dev_warn(dev, "Sensor type 2 is deprecated, please use 4 " | ||
498 | "instead\n"); | ||
499 | val = 4; | ||
500 | } | ||
501 | /* 3 = thermal diode; 4 = thermistor; 0 = disabled */ | ||
497 | if (val == 3) | 502 | if (val == 3) |
498 | data->sensor |= 1 << nr; | 503 | data->sensor |= 1 << nr; |
499 | else if (val == 2) | 504 | else if (val == 4) |
500 | data->sensor |= 8 << nr; | 505 | data->sensor |= 8 << nr; |
501 | else if (val != 0) { | 506 | else if (val != 0) { |
502 | mutex_unlock(&data->update_lock); | 507 | mutex_unlock(&data->update_lock); |