diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-15 10:14:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-15 10:14:05 -0700 |
| commit | 051e6b7e34b9bd24f46725f74994a4d3a653966e (patch) | |
| tree | 31d94b384aea613ebe7b17b87d1f1921c4408e16 /drivers/hwmon/drivetemp.c | |
| parent | Merge tag 'sound-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
| parent | hwmon: (da9052) Synchronize access with mfd (diff) | |
| download | wireguard-linux-051e6b7e34b9bd24f46725f74994a4d3a653966e.tar.xz wireguard-linux-051e6b7e34b9bd24f46725f74994a4d3a653966e.zip | |
Merge tag 'hwmon-for-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- Fix ADC access synchronization problem with da9052 driver
- Fix temperature limit and status reporting in nct7904 driver
- Fix drivetemp temperature reporting if SCT is supported but SCT data
tables are not.
* tag 'hwmon-for-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (da9052) Synchronize access with mfd
hwmon: (nct7904) Fix incorrect range of temperature limit registers
hwmon: (nct7904) Read all SMI status registers in probe function
hwmon: (drivetemp) Fix SCT support if SCT data tables are not supported
Diffstat (limited to 'drivers/hwmon/drivetemp.c')
| -rw-r--r-- | drivers/hwmon/drivetemp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/drivetemp.c b/drivers/hwmon/drivetemp.c index 9179460c2d9d..0d4f3d97ffc6 100644 --- a/drivers/hwmon/drivetemp.c +++ b/drivers/hwmon/drivetemp.c @@ -346,7 +346,7 @@ static int drivetemp_identify_sata(struct drivetemp_data *st) st->have_temp_highest = temp_is_valid(buf[SCT_STATUS_TEMP_HIGHEST]); if (!have_sct_data_table) - goto skip_sct; + goto skip_sct_data; /* Request and read temperature history table */ memset(buf, '\0', sizeof(st->smartdata)); |