Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / scripts / mod / file2alias.c

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 44ddaa542db6fbb6612560ac312b65ffca330b4c..5759751a1f61212ec02e16de995a8a0482b37c11 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -336,10 +336,13 @@ static int do_hid_entry(const char *filename,
                             struct hid_device_id *id, char *alias)
 {
        id->bus = TO_NATIVE(id->bus);
+       id->group = TO_NATIVE(id->group);
        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);