tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'hwmon-for-linus-v4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

- fix a loop limit in nct6775 driver

- disable fan support for Dell XPS13 9333

* tag 'hwmon-for-linus-v4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (nct6775) Fix loop limit
hwmon: (dell-smm) Disable fan support for Dell XPS13 9333

Linus Torvalds 303f311e f43fc5a0

+8 -1
+7
drivers/hwmon/dell-smm-hwmon.c
··· 1074 1074 DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Vostro 3360"), 1075 1075 }, 1076 1076 }, 1077 + { 1078 + .ident = "Dell XPS13 9333", 1079 + .matches = { 1080 + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 1081 + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "XPS13 9333"), 1082 + }, 1083 + }, 1077 1084 { } 1078 1085 }; 1079 1086
+1 -1
drivers/hwmon/nct6775.c
··· 4175 4175 * The temperature is already monitored if the respective bit in <mask> 4176 4176 * is set. 4177 4177 */ 4178 - for (i = 0; i < 32; i++) { 4178 + for (i = 0; i < 31; i++) { 4179 4179 if (!(data->temp_mask & BIT(i + 1))) 4180 4180 continue; 4181 4181 if (!reg_temp_alternate[i])