Commit 51b54b80 authored by Cameron Gutman's avatar Cameron Gutman Committed by Greg Kroah-Hartman

Input: xpad - restore LED state after device resume

[ Upstream commit a1fbf5bb ]

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: default avatarCameron Gutman <aicommander@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e9c7ce13
...@@ -1213,6 +1213,7 @@ static int xpad_led_probe(struct usb_xpad *xpad) ...@@ -1213,6 +1213,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
led_cdev = &led->led_cdev; led_cdev = &led->led_cdev;
led_cdev->name = led->name; led_cdev->name = led->name;
led_cdev->brightness_set = xpad_led_set; led_cdev->brightness_set = xpad_led_set;
led_cdev->flags = LED_CORE_SUSPENDRESUME;
error = led_classdev_register(&xpad->udev->dev, led_cdev); error = led_classdev_register(&xpad->udev->dev, led_cdev);
if (error) if (error)
...@@ -1689,8 +1690,16 @@ static int xpad_resume(struct usb_interface *intf) ...@@ -1689,8 +1690,16 @@ static int xpad_resume(struct usb_interface *intf)
retval = xpad360w_start_input(xpad); retval = xpad360w_start_input(xpad);
} else { } else {
mutex_lock(&input->mutex); mutex_lock(&input->mutex);
if (input->users) if (input->users) {
retval = xpad_start_input(xpad); 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); mutex_unlock(&input->mutex);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment