aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2013-12-19 11:05:13 -0500
committerJiri Kosina <jkosina@suse.cz>2013-12-20 17:24:40 -0500
commitbbe3175408cde792fbaa5bd1e41e430ea9e4fb4f (patch)
tree3f134bf0db21dcb8382023367b5b0483da7c9afc /drivers/hid
parenta443255c3ed5688931d89adcaa640dd10e1aeef0 (diff)
HID: input: fix input sysfs path for hid devices
we used to set the parent of the input device as the parent of the hid bus. This was introduced when we created hid as a real bus, and to keep backward compatibility. Now, it's time to proper set the parent so that sysfs has an idea of which input device is attached to which hid device. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index d97f2323af57..d50e7313b171 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1279,7 +1279,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid)
1279 input_dev->id.vendor = hid->vendor; 1279 input_dev->id.vendor = hid->vendor;
1280 input_dev->id.product = hid->product; 1280 input_dev->id.product = hid->product;
1281 input_dev->id.version = hid->version; 1281 input_dev->id.version = hid->version;
1282 input_dev->dev.parent = hid->dev.parent; 1282 input_dev->dev.parent = &hid->dev;
1283 hidinput->input = input_dev; 1283 hidinput->input = input_dev;
1284 list_add_tail(&hidinput->list, &hid->inputs); 1284 list_add_tail(&hidinput->list, &hid->inputs);
1285 1285