diff options
| author |   Jaejoong Kim <climbbb.kim@gmail.com> | 2017-03-03 17:54:01 +0900 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2017-03-21 15:24:01 +0100 |
| commit | 733aca90300b76575b8a465dc49cbed7a991fd8b (patch) | |
| tree | 6e31e874a11be2b7cbe45cc0512b767dd01a40cd /drivers/hid/usbhid | |
| parent | HID: cp2112: use proper hidraw name with minor number (diff) | |
| download | wireguard-linux-733aca90300b76575b8a465dc49cbed7a991fd8b.tar.xz wireguard-linux-733aca90300b76575b8a465dc49cbed7a991fd8b.zip | |
HID: hiddev: reallocate hiddev's minor number
We need to store the minor number each drivers. In case of hidraw, the
minor number is stored stores in struct hidraw. But hiddev's minor is
located in struct hid_device.
The hid-core driver announces a kernel message which driver is loaded when
HID device connected, but hiddev's minor number is always zero. To proper
display hiddev's minor number, we need to store the minor number asked from
usb core and do some refactoring work (move from hiddev.c to hiddev.h) to
access hiddev in hid-core.
[jkosina@suse.cz: rebase on top of newer codebase]
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jaejoong Kim <climbbb.kim@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/hiddev.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 667171829f65..a8baaf60e28a 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -46,17 +46,6 @@ #endif #define HIDDEV_BUFFER_SIZE 2048 -struct hiddev { - int exist; - int open; - struct mutex existancelock; - wait_queue_head_t wait; - struct hid_device *hid; - struct list_head list; - spinlock_t list_lock; - bool initialized; -}; - struct hiddev_list { struct hiddev_usage_ref buffer[HIDDEV_BUFFER_SIZE]; int head; @@ -923,6 +912,8 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) */ hiddev->initialized = hid->quirks & HID_QUIRK_NO_INIT_REPORTS; + hiddev->minor = usbhid->intf->minor; + return 0; } |