summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCameron Gutman <aicommander@gmail.com>2022-08-18 17:44:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-10-15 07:59:04 +0200
commit2c657a0cbd481eda0a6e12c45f55f03d3332223b (patch)
treef43c6c893d777fbeae17b05ea2d7f2be388170ed
parentdb4db28fccb47a4476f2ea1fd5ea22da8f6bedde (diff)
downloadlinux-stable-2c657a0cbd481eda0a6e12c45f55f03d3332223b.tar.gz
linux-stable-2c657a0cbd481eda0a6e12c45f55f03d3332223b.tar.bz2
linux-stable-2c657a0cbd481eda0a6e12c45f55f03d3332223b.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.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index db3c81e44160..dbfabd229a7c 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1991,7 +1991,6 @@ static struct usb_driver xpad_driver = {
.disconnect = xpad_disconnect,
.suspend = xpad_suspend,
.resume = xpad_resume,
- .reset_resume = xpad_resume,
.id_table = xpad_table,
};