summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2012-04-23 10:07:04 (GMT)
committerJiri Kosina <jkosina@suse.cz>2012-05-01 10:54:54 (GMT)
commit7431fb767d896b7f0048039f2e17707ea057d35a (patch)
tree447b273a486a8855a0d88e905b0dde1b1c38feae /scripts
parent734c660931095ae165c0db6ff60558fc4173bfd0 (diff)
downloadlinux-3.10-7431fb767d896b7f0048039f2e17707ea057d35a.zip
linux-3.10-7431fb767d896b7f0048039f2e17707ea057d35a.tar.gz
linux-3.10-7431fb767d896b7f0048039f2e17707ea057d35a.tar.bz2
HID: Allow bus wildcard matching
Most HID drivers do not need to know what bus driver is in use. A generic group driver can drive any hid device, and the device list should not need to be duplicated for each new bus. This patch adds wildcard matching to the HID bus, simplifying device list handling for group drivers. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mod/file2alias.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index fe967ce..056de31 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -340,7 +340,8 @@ static int do_hid_entry(const char *filename,
id->vendor = TO_NATIVE(id->vendor);
id->product = TO_NATIVE(id->product);
- sprintf(alias, "hid:b%04X", id->bus);
+ sprintf(alias, "hid:");
+ ADD(alias, "b", id->bus != HID_BUS_ANY, id->bus);
ADD(alias, "g", id->group != HID_GROUP_ANY, id->group);
ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor);
ADD(alias, "p", id->product != HID_ANY_ID, id->product);