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-microsoft.c | |
| parent | fea6f1833b5bbff7066bcde1fa1141c9717bbad2 (diff) | |
| download | linux-93c10132a7ac160df3175b53f7ee857625412165.tar.bz2 | |
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-microsoft.c')
| -rw-r--r-- | drivers/hid/hid-microsoft.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 1fa8b813d441..d718b1607d0f 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c @@ -154,8 +154,6 @@ static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id) hid_set_drvdata(hdev, (void *)quirks); - if (quirks & MS_HIDINPUT) - hdev->quirks |= HID_QUIRK_HIDINPUT; if (quirks & MS_NOGET) hdev->quirks |= HID_QUIRK_NOGET; @@ -165,7 +163,8 @@ static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id) goto err_free; } - ret = hid_hw_start(hdev); + ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT | ((quirks & MS_HIDINPUT) ? + HID_CONNECT_HIDINPUT_FORCE : 0)); if (ret) { dev_err(&hdev->dev, "hw start failed\n"); goto err_free; |