HID: move connect quirks

[linux-2.6-omap-h63xx.git] / drivers / hid / hid-microsoft.c

diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
index 1fa8b813d441b6602b7fda966a5b3d55bfa4c5b1..d718b1607d0f78f505419b911a0fb86df62e1e17 100644 (file)
--- 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;