diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2008-06-27 00:04:24 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-14 23:50:56 +0200 |
| commit | 93c10132a7ac160df3175b53f7ee857625412165 (patch) | |
| tree | 64ea194ddd7791d44394bb2a918921a2906fe1ee /drivers/hid/hid-belkin.c | |
| parent | fea6f1833b5bbff7066bcde1fa1141c9717bbad2 (diff) | |
| download | kernel-crypto-93c10132a7ac160df3175b53f7ee857625412165.tar.gz kernel-crypto-93c10132a7ac160df3175b53f7ee857625412165.tar.xz kernel-crypto-93c10132a7ac160df3175b53f7ee857625412165.zip | |
HID: move connect quirks
Move connecting from usbhid to the hid layer and fix also hidp in
that manner.
This removes all the ignore/force hidinput/hiddev connecting quirks.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-belkin.c')
| -rw-r--r-- | drivers/hid/hid-belkin.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hid/hid-belkin.c b/drivers/hid/hid-belkin.c index 050b9892d7e..12c8a9ba6ed 100644 --- a/drivers/hid/hid-belkin.c +++ b/drivers/hid/hid-belkin.c @@ -54,16 +54,14 @@ static int belkin_probe(struct hid_device *hdev, const struct hid_device_id *id) hid_set_drvdata(hdev, (void *)quirks); - if (quirks & BELKIN_HIDDEV) - hdev->quirks |= HID_QUIRK_HIDDEV; - ret = hid_parse(hdev); if (ret) { dev_err(&hdev->dev, "parse failed\n"); goto err_free; } - ret = hid_hw_start(hdev); + ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT | + ((quirks & BELKIN_HIDDEV) ? HID_CONNECT_HIDDEV_FORCE : 0)); if (ret) { dev_err(&hdev->dev, "hw start failed\n"); goto err_free; |