summaryrefslogtreecommitdiff
path: root/drivers/usb/input/hid-input.c
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2002-07-15 03:18:42 -0700
committerVojtech Pavlik <vojtech@suse.cz>2002-07-15 03:18:42 -0700
commitb24be862cc6543ef76e17c55cc11c69e2dd8bc62 (patch)
treec8bff63819bb2fe833304d075aea553827c1cc96 /drivers/usb/input/hid-input.c
parent182147c1e9cae403852ec2e1107fe62b390012be (diff)
[PATCH] Updates for hiddev by Paul Stewart
I've merged a patch Paul Stewart sent me some time ago, which should make life easier for the guys writing UPS daemons.
Diffstat (limited to 'drivers/usb/input/hid-input.c')
-rw-r--r--drivers/usb/input/hid-input.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
index 37f12424cb6f..a036b23f6fa6 100644
--- a/drivers/usb/input/hid-input.c
+++ b/drivers/usb/input/hid-input.c
@@ -474,11 +474,12 @@ int hidinput_connect(struct hid_device *hid)
struct list_head *list;
int i, j, k;
- for (i = 0; i < hid->maxapplication; i++)
- if (IS_INPUT_APPLICATION(hid->application[i]))
+ for (i = 0; i < hid->maxcollection; i++)
+ if (hid->collection[i].type == HID_COLLECTION_APPLICATION &&
+ IS_INPUT_APPLICATION(hid->collection[i].usage))
break;
- if (i == hid->maxapplication)
+ if (i == hid->maxcollection)
return -1;
hid->input.private = hid;