1 files changed, 45 insertions, 5 deletions

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 61c761156371..6f8755e2c491 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -881,17 +881,57 @@ struct xpad_led {
         struct usb_xpad *xpad;
 };
 
+/**
+ * @param command
+ *  0: off
+ *  1: all blink, then previous setting
+ *  2: 1/top-left blink, then on
+ *  3: 2/top-right blink, then on
+ *  4: 3/bottom-left blink, then on
+ *  5: 4/bottom-right blink, then on
+ *  6: 1/top-left on
+ *  7: 2/top-right on
+ *  8: 3/bottom-left on
+ *  9: 4/bottom-right on
+ * 10: rotate
+ * 11: blink, based on previous setting
+ * 12: slow blink, based on previous setting
+ * 13: rotate with two lights
+ * 14: persistent slow all blink
+ * 15: blink once, then previous setting
+ */
 static void xpad_send_led_command(struct usb_xpad *xpad, int command)
 {
-        if (command >= 0 && command < 14) {
-                mutex_lock(&xpad->odata_mutex);
+        command %= 16;
+
+        mutex_lock(&xpad->odata_mutex);
+
+        switch (xpad->xtype) {
+        case XTYPE_XBOX360:
                 xpad->odata[0] = 0x01;
                 xpad->odata[1] = 0x03;
                 xpad->odata[2] = command;
                 xpad->irq_out->transfer_buffer_length = 3;
-                usb_submit_urb(xpad->irq_out, GFP_KERNEL);
-                mutex_unlock(&xpad->odata_mutex);
+                break;
+        case XTYPE_XBOX360W:
+                xpad->odata[0] = 0x00;
+                xpad->odata[1] = 0x00;
+                xpad->odata[2] = 0x08;
+                xpad->odata[3] = 0x40 + command;
+                xpad->odata[4] = 0x00;
+                xpad->odata[5] = 0x00;
+                xpad->odata[6] = 0x00;
+                xpad->odata[7] = 0x00;
+                xpad->odata[8] = 0x00;
+                xpad->odata[9] = 0x00;
+                xpad->odata[10] = 0x00;
+                xpad->odata[11] = 0x00;
+                xpad->irq_out->transfer_buffer_length = 12;
+                break;
         }
+
+        usb_submit_urb(xpad->irq_out, GFP_KERNEL);
+        mutex_unlock(&xpad->odata_mutex);
 }
 
 static void xpad_led_set(struct led_classdev *led_cdev,
@@ -911,7 +951,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
         struct led_classdev *led_cdev;
         int error;
 
-        if (xpad->xtype != XTYPE_XBOX360)
+        if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX360W)
                 return 0;
 
         xpad->led = led = kzalloc(sizeof(struct xpad_led), GFP_KERNEL);