Commit 303f311e authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-linus-v4.18-rc2' of...

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
parents f43fc5a0 91bb8f45
...@@ -1074,6 +1074,13 @@ static struct dmi_system_id i8k_blacklist_fan_support_dmi_table[] __initdata = { ...@@ -1074,6 +1074,13 @@ static struct dmi_system_id i8k_blacklist_fan_support_dmi_table[] __initdata = {
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Vostro 3360"), DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Vostro 3360"),
}, },
}, },
{
.ident = "Dell XPS13 9333",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "XPS13 9333"),
},
},
{ } { }
}; };
......
...@@ -4175,7 +4175,7 @@ static int nct6775_probe(struct platform_device *pdev) ...@@ -4175,7 +4175,7 @@ static int nct6775_probe(struct platform_device *pdev)
* The temperature is already monitored if the respective bit in <mask> * The temperature is already monitored if the respective bit in <mask>
* is set. * is set.
*/ */
for (i = 0; i < 32; i++) { for (i = 0; i < 31; i++) {
if (!(data->temp_mask & BIT(i + 1))) if (!(data->temp_mask & BIT(i + 1)))
continue; continue;
if (!reg_temp_alternate[i]) if (!reg_temp_alternate[i])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment