diff mbox series

[2/4] Input: xpad - fix wireless 360 controller breaking after suspend

Message ID 20220818130021.487410-3-rojtberg@gmail.com (mailing list archive)
State Superseded
Headers show
Series Input: xpad - sync with github fork | expand

Commit Message

Pavel Rojtberg Aug. 18, 2022, 1 p.m. UTC
From: Cameron Gutman <aicommander@gmail.com>

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.

Signed-off-by: Cameron Gutman <aicommander@gmail.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Greg Kroah-Hartman Aug. 18, 2022, 1:10 p.m. UTC | #1
On Thu, Aug 18, 2022 at 03:00:19PM +0200, Pavel Rojtberg wrote:
> From: Cameron Gutman <aicommander@gmail.com>
> 
> 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.
> 
> Signed-off-by: Cameron Gutman <aicommander@gmail.com>
> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
> ---
>  drivers/input/joystick/xpad.c | 1 -
>  1 file changed, 1 deletion(-)

What commit id does this fix?  Should it go to stable kernels?

thanks,

greg k-h
Pavel Rojtberg Aug. 18, 2022, 1:51 p.m. UTC | #2
Am 18.08.22 um 15:10 schrieb Greg KH:
> On Thu, Aug 18, 2022 at 03:00:19PM +0200, Pavel Rojtberg wrote:
>> From: Cameron Gutman <aicommander@gmail.com>
>>
>> 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.
>>
>> Signed-off-by: Cameron Gutman <aicommander@gmail.com>
>> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
>> ---
>>  drivers/input/joystick/xpad.c | 1 -
>>  1 file changed, 1 deletion(-)
> 
> What commit id does this fix?  Should it go to stable kernels?
> 
> thanks,
> 
> greg k-h

this is a fixup for 4220f7db1e424f2a086ad41217b5770cc9f003a9.

It should be applied to stable kernels, too.

Greetings, Pavel
Greg Kroah-Hartman Aug. 18, 2022, 2:07 p.m. UTC | #3
On Thu, Aug 18, 2022 at 03:51:55PM +0200, Pavel Rojtberg wrote:
> Am 18.08.22 um 15:10 schrieb Greg KH:
> > On Thu, Aug 18, 2022 at 03:00:19PM +0200, Pavel Rojtberg wrote:
> >> From: Cameron Gutman <aicommander@gmail.com>
> >>
> >> 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.
> >>
> >> Signed-off-by: Cameron Gutman <aicommander@gmail.com>
> >> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
> >> ---
> >>  drivers/input/joystick/xpad.c | 1 -
> >>  1 file changed, 1 deletion(-)
> > 
> > What commit id does this fix?  Should it go to stable kernels?
> > 
> > thanks,
> > 
> > greg k-h
> 
> this is a fixup for 4220f7db1e424f2a086ad41217b5770cc9f003a9.

Great, can you resend and add the Fixes: tag for it like:
	Fixes: 4220f7db1e42 ("Input: xpad - workaround dead irq_out after suspend/ resume")

> It should be applied to stable kernels, too.

Great, it needs a stable tag too.

thanks,

greg k-h
diff mbox series

Patch

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 629646b..4e01056 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,
 };