diff options
| author |   Cameron Gutman <aicommander@gmail.com> | 2017-09-12 11:27:44 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-12 11:45:59 -0700 |
| commit | 122d6a347329818419b032c5a1776e6b3866d9b9 (patch) | |
| tree | 3215ef6cff3e84589de61fbbeeb578f4e52e470c /drivers/input/joystick/xpad.c | |
| parent | Input: ucb1400_ts - fix suspend and resume handling (diff) | |
| download | linux-dev-122d6a347329818419b032c5a1776e6b3866d9b9.tar.xz linux-dev-122d6a347329818419b032c5a1776e6b3866d9b9.zip | |
Input: xpad - validate USB endpoint type during probe
We should only see devices with interrupt endpoints. Ignore any other
endpoints that we find, so we don't send try to send them interrupt URBs
and trigger a WARN down in the USB stack.
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Cc: <stable@vger.kernel.org> # c01b5e7464f0 Input: xpad - don't depend on endpoint order
Signed-off-by: Cameron Gutman <aicommander@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick/xpad.c')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 2578a7677040..f670dcb401c0 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -1750,10 +1750,12 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id struct usb_endpoint_descriptor *ep = &intf->cur_altsetting->endpoint[i].desc; - if (usb_endpoint_dir_in(ep)) - ep_irq_in = ep; - else - ep_irq_out = ep; + if (usb_endpoint_xfer_int(ep)) { + if (usb_endpoint_dir_in(ep)) + ep_irq_in = ep; + else + ep_irq_out = ep; + } } if (!ep_irq_in || !ep_irq_out) { |