Input: xpad - restore LED state after device resume

Set the LED_CORE_SUSPENDRESUME flag on our LED device so the
LED state will be automatically restored by LED core on resume.

Since Xbox One pads stop flashing only when reinitialized, we'll
send them the initialization packet so they calm down too.

Signed-off-by: Cameron Gutman <aicommander@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 03e24f56a35b0ef6b8d8d11341b70a1674f9f1f5..155fcb3b6230a01da6d1de3ab772e508b56fef78 100644 (file)
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1211,6 +1211,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
        led_cdev = &led->led_cdev;
        led_cdev->name = led->name;
        led_cdev->brightness_set = xpad_led_set;
+       led_cdev->flags = LED_CORE_SUSPENDRESUME;
 
        error = led_classdev_register(&xpad->udev->dev, led_cdev);
        if (error)
@@ -1687,8 +1688,16 @@ static int xpad_resume(struct usb_interface *intf)
                retval = xpad360w_start_input(xpad);
        } else {
                mutex_lock(&input->mutex);
-               if (input->users)
+               if (input->users) {
                        retval = xpad_start_input(xpad);
+               } else if (xpad->xtype == XTYPE_XBOXONE) {
+                       /*
+                        * Even if there are no users, we'll send Xbox One pads
+                        * the startup sequence so they don't sit there and
+                        * blink until somebody opens the input device again.
+                        */
+                       retval = xpad_start_xbox_one(xpad);
+               }
                mutex_unlock(&input->mutex);
        }