aboutsummaryrefslogtreecommitdiffstats
path: root/d01.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-10 15:18:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-10 15:18:10 +0200
commitd330c5b27ba6318556007d16833bd7d3748723dc (patch)
tree348e524486b51845bbc0d961ec7270b50d489955 /d01.patch
parent80110d83f22bdbff0a6973bec911f34eb433c428 (diff)
downloadpatches-d330c5b27ba6318556007d16833bd7d3748723dc.tar.gz
patches refreshed
Diffstat (limited to 'd01.patch')
-rw-r--r--d01.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/d01.patch b/d01.patch
index 534d9fc3b1e9a8..61d439d69cf7fe 100644
--- a/d01.patch
+++ b/d01.patch
@@ -4,7 +4,7 @@
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
-@@ -2143,7 +2143,7 @@ struct hid_dynid {
+@@ -2140,7 +2140,7 @@ struct hid_dynid {
* Adds a new dynamic hid device ID to this driver,
* and causes the driver to probe for all devices again.
*/
@@ -13,7 +13,7 @@
size_t count)
{
struct hid_driver *hdrv = to_hid_driver(drv);
-@@ -2175,7 +2175,13 @@ static ssize_t store_new_id(struct devic
+@@ -2172,7 +2172,13 @@ static ssize_t store_new_id(struct devic
return ret ? : count;
}
@@ -28,7 +28,7 @@
static void hid_free_dynids(struct hid_driver *hdrv)
{
-@@ -2339,6 +2345,7 @@ static int hid_uevent(struct device *dev
+@@ -2336,6 +2342,7 @@ static int hid_uevent(struct device *dev
static struct bus_type hid_bus_type = {
.name = "hid",
.dev_groups = hid_dev_groups,
@@ -36,7 +36,7 @@
.match = hid_bus_match,
.probe = hid_device_probe,
.remove = hid_device_remove,
-@@ -2778,8 +2785,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device);
+@@ -2775,8 +2782,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device);
int __hid_register_driver(struct hid_driver *hdrv, struct module *owner,
const char *mod_name)
{
@@ -45,7 +45,7 @@
hdrv->driver.name = hdrv->name;
hdrv->driver.bus = &hid_bus_type;
hdrv->driver.owner = owner;
-@@ -2788,21 +2793,12 @@ int __hid_register_driver(struct hid_dri
+@@ -2785,21 +2790,12 @@ int __hid_register_driver(struct hid_dri
INIT_LIST_HEAD(&hdrv->dyn_list);
spin_lock_init(&hdrv->dyn_lock);