diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-07 15:06:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-07 15:06:31 -0700 |
| commit | ecb095bff5d4b8711a81968625b3b4a235d3e477 (patch) | |
| tree | 93076ca82d7a48e359d20085711f8a53ac1cc830 /drivers | |
| parent | 33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9 (diff) | |
| parent | a95a4f3f2702b55a89393bf0f1b2b3d79e0f7da2 (diff) | |
| download | linux-ecb095bff5d4b8711a81968625b3b4a235d3e477.tar.bz2 | |
Merge tag 'hwmon-for-v5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Fixes to lm75 and nct7802 drivers
In the lm75 driver, fix TMP75B chip description to ensure correct
initialization. In the nct7802 driver, fix in4 presence detection"
* tag 'hwmon-for-v5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (lm75) Fixup tmp75b clr_mask
hwmon: (nct7802) Fix wrong detection of in4 presence
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/lm75.c | 2 | ||||
| -rw-r--r-- | drivers/hwmon/nct7802.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 3fb9c0a2d6d0..ce5ec403ec73 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -343,7 +343,7 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id) data->sample_time = MSEC_PER_SEC / 2; break; case tmp75b: /* not one-shot mode, Conversion rate 37Hz */ - clr_mask |= 1 << 15 | 0x3 << 13; + clr_mask |= 1 << 7 | 0x3 << 5; data->resolution = 12; data->sample_time = MSEC_PER_SEC / 37; break; diff --git a/drivers/hwmon/nct7802.c b/drivers/hwmon/nct7802.c index ec7bcf8d7cd6..f3dd2a17bd42 100644 --- a/drivers/hwmon/nct7802.c +++ b/drivers/hwmon/nct7802.c @@ -704,7 +704,7 @@ static struct attribute *nct7802_in_attrs[] = { &sensor_dev_attr_in3_alarm.dev_attr.attr, &sensor_dev_attr_in3_beep.dev_attr.attr, - &sensor_dev_attr_in4_input.dev_attr.attr, /* 17 */ + &sensor_dev_attr_in4_input.dev_attr.attr, /* 16 */ &sensor_dev_attr_in4_min.dev_attr.attr, &sensor_dev_attr_in4_max.dev_attr.attr, &sensor_dev_attr_in4_alarm.dev_attr.attr, @@ -730,9 +730,9 @@ static umode_t nct7802_in_is_visible(struct kobject *kobj, if (index >= 6 && index < 11 && (reg & 0x03) != 0x03) /* VSEN1 */ return 0; - if (index >= 11 && index < 17 && (reg & 0x0c) != 0x0c) /* VSEN2 */ + if (index >= 11 && index < 16 && (reg & 0x0c) != 0x0c) /* VSEN2 */ return 0; - if (index >= 17 && (reg & 0x30) != 0x30) /* VSEN3 */ + if (index >= 16 && (reg & 0x30) != 0x30) /* VSEN3 */ return 0; return attr->mode; |