| Message ID | 20230411031650.960322-3-vi@endrift.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cf5950187319346d7cdc62522f90479dfefd9235 |
| Headers | show |
| Series | Improve GIP support | expand |
On Mon, Apr 10, 2023 at 08:16:50PM -0700, Vicki Pfau wrote: > This commit explicitly disables the audio interface the same way the official > driver does. This is needed for some controllers, such as the PowerA Enhanced > Wired Controller for Series X|S (0x20d6:0x200e) to report the guide button. > > Signed-off-by: Vicki Pfau <vi@endrift.com> Applied, thank you.
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 6ea9c10dfb8a..175fcba7f92d 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -1396,6 +1396,16 @@ static int xpad_start_xbox_one(struct usb_xpad *xpad) unsigned long flags; int retval; + if (usb_ifnum_to_if(xpad->udev, GIP_WIRED_INTF_AUDIO)) { + /* Explicitly disable the audio interface. This is needed for some + * controllers, such as the PowerA Enhanced Wired Controller + * for Series X|S (0x20d6:0x200e) to report the guide button */ + retval = usb_set_interface(xpad->udev, GIP_WIRED_INTF_AUDIO, 0); + if (retval) + dev_warn(&xpad->dev->dev, + "unable to disable audio interface: %d\n", retval); + } + spin_lock_irqsave(&xpad->odata_lock, flags); /*
This commit explicitly disables the audio interface the same way the official driver does. This is needed for some controllers, such as the PowerA Enhanced Wired Controller for Series X|S (0x20d6:0x200e) to report the guide button. Signed-off-by: Vicki Pfau <vi@endrift.com> --- drivers/input/joystick/xpad.c | 10 ++++++++++ 1 file changed, 10 insertions(+)