diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-22 17:08:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-22 17:08:18 +0100 |
| commit | e7d7dc0e0e7ab68f1845e11b7574d83ac8015e0e (patch) | |
| tree | 72d317ef93f50aa80af2f67c9d109e7ff59413ff /p31.patch | |
| parent | 08ba5e5e533732546b64764231406dd6151342c1 (diff) | |
| download | patches-e7d7dc0e0e7ab68f1845e11b7574d83ac8015e0e.tar.gz | |
lots of patches and fixes added and made
Diffstat (limited to 'p31.patch')
| -rw-r--r-- | p31.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/p31.patch b/p31.patch new file mode 100644 index 00000000000000..ce0c9da626fb36 --- /dev/null +++ b/p31.patch @@ -0,0 +1,32 @@ +--- + drivers/hid/intel-ish-hid/ishtp/bus.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/hid/intel-ish-hid/ishtp/bus.c ++++ b/drivers/hid/intel-ish-hid/ishtp/bus.c +@@ -321,11 +321,13 @@ static ssize_t modalias_show(struct devi + len = snprintf(buf, PAGE_SIZE, "ishtp:%s\n", dev_name(dev)); + return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; + } ++static DEVICE_ATTR_RO(modalias); + +-static struct device_attribute ishtp_cl_dev_attrs[] = { +- __ATTR_RO(modalias), +- __ATTR_NULL, ++static struct attribute *ishtp_cl_dev_attrs[] = { ++ &dev_attr_modalias.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(ishtp_cl_dev); + + static int ishtp_cl_uevent(struct device *dev, struct kobj_uevent_env *env) + { +@@ -346,7 +348,7 @@ static const struct dev_pm_ops ishtp_cl_ + + static struct bus_type ishtp_cl_bus_type = { + .name = "ishtp", +- .dev_attrs = ishtp_cl_dev_attrs, ++ .dev_groups = ishtp_cl_dev_groups, + .probe = ishtp_cl_device_probe, + .remove = ishtp_cl_device_remove, + .pm = &ishtp_cl_bus_dev_pm_ops, |