diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2006-12-08 18:41:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-08 10:43:14 -0800 |
| commit | 4916b3a57fc94664677d439b911b8aaf86c7ec23 (patch) | |
| tree | fc8038ec52950ddfdb1c6c66f90eb1c381e446ca /drivers/hid | |
| parent | 229695e51efc4ed5e04ab471c82591d0f432909d (diff) | |
| download | linux-4916b3a57fc94664677d439b911b8aaf86c7ec23.tar.gz linux-4916b3a57fc94664677d439b911b8aaf86c7ec23.tar.bz2 linux-4916b3a57fc94664677d439b911b8aaf86c7ec23.zip | |
[PATCH] Generic HID layer - USB API
- 'dev' in struct hid_device changed from struct usb_device to
struct device and fixed all the users
- renamed functions which are part of USB HID API from 'hid_*' to
'usbhid_*'
- force feedback initialization moved from common part into USB-specific
driver
- added usbhid.h header for USB HID API users
- removed USB-specific fields from struct hid_device and moved them
to new usbhid_device, which is pointed to by hid_device->driver_data
- fixed all USB users to use this new structure
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-input.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 6d3d80ba9582..e542ef971c46 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -798,8 +798,7 @@ int hidinput_connect(struct hid_device *hid) input_dev->id.vendor = hid->vendor; input_dev->id.product = hid->product; input_dev->id.version = hid->version; - input_dev->cdev.dev = &hid->intf->dev; - + input_dev->cdev.dev = hid->dev; hidinput->input = input_dev; list_add_tail(&hidinput->list, &hid->inputs); } @@ -821,13 +820,8 @@ int hidinput_connect(struct hid_device *hid) } } - /* This only gets called when we are a single-input (most of the - * time). IOW, not a HID_QUIRK_MULTI_INPUT. The hid_ff_init() is - * only useful in this case, and not for multi-input quirks. */ - if (hidinput) { - hid_ff_init(hid); + if (hidinput) input_register_device(hidinput->input); - } return 0; } |