diff options
| author | Cameron Gutman <aicommander@gmail.com> | 2022-08-18 17:44:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-26 13:19:19 +0200 |
| commit | c3024d1bd817014bf53656b324db6e413a9e46a3 (patch) | |
| tree | c64d5cbcbf22c7d7be8e0e9c41e94c4d416686d5 | |
| parent | bbaa74b35e5bf3df3f743daede9e03aff1ea728b (diff) | |
| download | linux-stable-c3024d1bd817014bf53656b324db6e413a9e46a3.tar.gz linux-stable-c3024d1bd817014bf53656b324db6e413a9e46a3.tar.bz2 linux-stable-c3024d1bd817014bf53656b324db6e413a9e46a3.zip | |
Input: xpad - fix wireless 360 controller breaking after suspend
commit a17b9841152e7f4621619902b347e2cc39c32996 upstream.
Suspending and resuming the system can sometimes cause the out
URB to get hung after a reset_resume. This causes LED setting
and force feedback to break on resume. To avoid this, just drop
the reset_resume callback so the USB core rebinds xpad to the
wireless pads on resume if a reset happened.
A nice side effect of this change is the LED ring on wireless
controllers is now set correctly on system resume.
Cc: stable@vger.kernel.org
Fixes: 4220f7db1e42 ("Input: xpad - workaround dead irq_out after suspend/ resume")
Signed-off-by: Cameron Gutman <aicommander@gmail.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
Link: https://lore.kernel.org/r/20220818154411.510308-3-rojtberg@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/input/joystick/xpad.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 264ff13b4c85..c125cd42faee 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -1997,7 +1997,6 @@ static struct usb_driver xpad_driver = { .disconnect = xpad_disconnect, .suspend = xpad_suspend, .resume = xpad_resume, - .reset_resume = xpad_resume, .id_table = xpad_table, }; |