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-samsung.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-samsung.c')
-rw-r--r-- | drivers/hid/hid-samsung.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hid-samsung.c b/drivers/hid/hid-samsung.c index 8771bfae02f5..15f3c0492450 100644 --- a/drivers/hid/hid-samsung.c +++ b/drivers/hid/hid-samsung.c | |||
@@ -52,15 +52,14 @@ static int samsung_probe(struct hid_device *hdev, | |||
52 | { | 52 | { |
53 | int ret; | 53 | int ret; |
54 | 54 | ||
55 | hdev->quirks |= HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT; | ||
56 | |||
57 | ret = hid_parse(hdev); | 55 | ret = hid_parse(hdev); |
58 | if (ret) { | 56 | if (ret) { |
59 | dev_err(&hdev->dev, "parse failed\n"); | 57 | dev_err(&hdev->dev, "parse failed\n"); |
60 | goto err_free; | 58 | goto err_free; |
61 | } | 59 | } |
62 | 60 | ||
63 | ret = hid_hw_start(hdev); | 61 | ret = hid_hw_start(hdev, (HID_CONNECT_DEFAULT & ~HID_CONNECT_HIDINPUT) | |
62 | HID_CONNECT_HIDDEV_FORCE); | ||
64 | if (ret) { | 63 | if (ret) { |
65 | dev_err(&hdev->dev, "hw start failed\n"); | 64 | dev_err(&hdev->dev, "hw start failed\n"); |
66 | goto err_free; | 65 | goto err_free; |