Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c
index 5d1d54cfa87e152ca35a310987b3af3e4c893486..f5474300b83a23708bdeebfb60b959d729221627 100644 (file)
--- a/drivers/hid/hid-dell.c
+++ b/drivers/hid/hid-dell.c
@@ -26,20 +26,20 @@ static int dell_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
        int ret;
 
-       hdev->quirks |= HID_QUIRK_RESET_LEDS;
-
        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);
        if (ret) {
                dev_err(&hdev->dev, "hw start failed\n");
                goto err_free;
        }
 
+       usbhid_set_leds(hdev);
+
        return 0;
 err_free:
        return ret;
@@ -47,6 +47,8 @@ err_free:
 
 static const struct hid_device_id dell_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, dell_devices);