Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / hid / hid-sjoy.c

diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c
index 16f7caf..670da91 100644 (file)
--- a/drivers/hid/hid-sjoy.c
+++ b/drivers/hid/hid-sjoy.c
@@ -65,8 +65,7 @@ static int sjoyff_init(struct hid_device *hid)
 {
        struct sjoyff_device *sjoyff;
        struct hid_report *report;
-       struct hid_input *hidinput = list_entry(hid->inputs.next,
-                                               struct hid_input, list);
+       struct hid_input *hidinput;
        struct list_head *report_list =
                        &hid->report_enum[HID_OUTPUT_REPORT].report_list;
        struct list_head *report_ptr = report_list;
@@ -78,43 +77,45 @@ static int sjoyff_init(struct hid_device *hid)
                return -ENODEV;
        }
 
-       report_ptr = report_ptr->next;
+       list_for_each_entry(hidinput, &hid->inputs, list) {
+               report_ptr = report_ptr->next;
 
-       if (report_ptr == report_list) {
-               hid_err(hid, "required output report is missing\n");
-               return -ENODEV;
-       }
+               if (report_ptr == report_list) {
+                       hid_err(hid, "required output report is missing\n");
+                       return -ENODEV;
+               }
 
-       report = list_entry(report_ptr, struct hid_report, list);
-       if (report->maxfield < 1) {
-               hid_err(hid, "no fields in the report\n");
-               return -ENODEV;
-       }
+               report = list_entry(report_ptr, struct hid_report, list);
+               if (report->maxfield < 1) {
+                       hid_err(hid, "no fields in the report\n");
+                       return -ENODEV;
+               }
 
-       if (report->field[0]->report_count < 3) {
-               hid_err(hid, "not enough values in the field\n");
-               return -ENODEV;
-       }
+               if (report->field[0]->report_count < 3) {
+                       hid_err(hid, "not enough values in the field\n");
+                       return -ENODEV;
+               }
 
-       sjoyff = kzalloc(sizeof(struct sjoyff_device), GFP_KERNEL);
-       if (!sjoyff)
-               return -ENOMEM;
+               sjoyff = kzalloc(sizeof(struct sjoyff_device), GFP_KERNEL);
+               if (!sjoyff)
+                       return -ENOMEM;
 
-       dev = hidinput->input;
+               dev = hidinput->input;
 
-       set_bit(FF_RUMBLE, dev->ffbit);
+               set_bit(FF_RUMBLE, dev->ffbit);
 
-       error = input_ff_create_memless(dev, sjoyff, hid_sjoyff_play);
-       if (error) {
-               kfree(sjoyff);
-               return error;
-       }
+               error = input_ff_create_memless(dev, sjoyff, hid_sjoyff_play);
+               if (error) {
+                       kfree(sjoyff);
+                       return error;
+               }
 
-       sjoyff->report = report;
-       sjoyff->report->field[0]->value[0] = 0x01;
-       sjoyff->report->field[0]->value[1] = 0x00;
-       sjoyff->report->field[0]->value[2] = 0x00;
-       usbhid_submit_report(hid, sjoyff->report, USB_DIR_OUT);
+               sjoyff->report = report;
+               sjoyff->report->field[0]->value[0] = 0x01;
+               sjoyff->report->field[0]->value[1] = 0x00;
+               sjoyff->report->field[0]->value[2] = 0x00;
+               usbhid_submit_report(hid, sjoyff->report, USB_DIR_OUT);
+       }
 
        hid_info(hid, "Force feedback for SmartJoy PLUS PS2/USB adapter\n");
 
@@ -131,6 +132,8 @@ static int sjoy_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
        int ret;
 
+       hdev->quirks |= id->driver_data;
+
        ret = hid_parse(hdev);
        if (ret) {
                hid_err(hdev, "parse failed\n");
@@ -151,7 +154,17 @@ err:
 }
 
 static const struct hid_device_id sjoy_devices[] = {
+       { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO),
+               .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |
+                              HID_QUIRK_SKIP_OUTPUT_REPORTS },
+       { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO),
+               .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |
+                              HID_QUIRK_SKIP_OUTPUT_REPORTS },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD),
+               .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |
+                              HID_QUIRK_SKIP_OUTPUT_REPORTS },
        { }
 };
 MODULE_DEVICE_TABLE(hid, sjoy_devices);