Commit b300c0fd authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-v6.6-rc3' of...

Merge tag 'hwmon-for-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "One patch to drop a non-existent alarm attribute in the nct6775 driver"

* tag 'hwmon-for-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (nct6775) Fix non-existent ALARM warning
parents 42dc8149 2dd1d862
...@@ -1910,6 +1910,10 @@ static umode_t nct6775_in_is_visible(struct kobject *kobj, ...@@ -1910,6 +1910,10 @@ static umode_t nct6775_in_is_visible(struct kobject *kobj,
struct device *dev = kobj_to_dev(kobj); struct device *dev = kobj_to_dev(kobj);
struct nct6775_data *data = dev_get_drvdata(dev); struct nct6775_data *data = dev_get_drvdata(dev);
int in = index / 5; /* voltage index */ int in = index / 5; /* voltage index */
int nr = index % 5; /* attribute index */
if (nr == 1 && data->ALARM_BITS[in] == -1)
return 0;
if (!(data->have_in & BIT(in))) if (!(data->have_in & BIT(in)))
return 0; return 0;
......
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