diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-06-26 18:04:24 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-14 17:50:56 -0400 |
commit | 93c10132a7ac160df3175b53f7ee857625412165 (patch) | |
tree | 64ea194ddd7791d44394bb2a918921a2906fe1ee /drivers/hid/hid-belkin.c | |
parent | fea6f1833b5bbff7066bcde1fa1141c9717bbad2 (diff) |
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 050b9892d7ef..12c8a9ba6ed6 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) | |||
54 | 54 | ||
55 | hid_set_drvdata(hdev, (void *)quirks); | 55 | hid_set_drvdata(hdev, (void *)quirks); |
56 | 56 | ||
57 | if (quirks & BELKIN_HIDDEV) | ||
58 | hdev->quirks |= HID_QUIRK_HIDDEV; | ||
59 | |||
60 | ret = hid_parse(hdev); | 57 | ret = hid_parse(hdev); |
61 | if (ret) { | 58 | if (ret) { |
62 | dev_err(&hdev->dev, "parse failed\n"); | 59 | dev_err(&hdev->dev, "parse failed\n"); |
63 | goto err_free; | 60 | goto err_free; |
64 | } | 61 | } |
65 | 62 | ||
66 | ret = hid_hw_start(hdev); | 63 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT | |
64 | ((quirks & BELKIN_HIDDEV) ? HID_CONNECT_HIDDEV_FORCE : 0)); | ||
67 | if (ret) { | 65 | if (ret) { |
68 | dev_err(&hdev->dev, "hw start failed\n"); | 66 | dev_err(&hdev->dev, "hw start failed\n"); |
69 | goto err_free; | 67 | goto err_free; |