diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-21 19:17:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-21 19:17:37 +0100 |
| commit | 08556e03ad36b2c6219aba90de88ccf58038e208 (patch) | |
| tree | 1619cc5f466534b66b351985526e82da32b52028 /drivers/usb/musb/musb_gadget_ep0.c | |
| parent | d1480f9b535fa3901b7f303959bc196b304472a9 (diff) | |
| parent | 6ba89b52ba6916bc7a3d390d70951e992c0ca39e (diff) | |
Merge tag 'v4.9.101' into linux-linaro-lsk-v4.9
This is the 4.9.101 stable release
Diffstat (limited to 'drivers/usb/musb/musb_gadget_ep0.c')
| -rw-r--r-- | drivers/usb/musb/musb_gadget_ep0.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c index 844a309fe895..e85b9c2a4910 100644 --- a/drivers/usb/musb/musb_gadget_ep0.c +++ b/drivers/usb/musb/musb_gadget_ep0.c @@ -114,15 +114,19 @@ static int service_tx_status_request( } is_in = epnum & USB_DIR_IN; - if (is_in) { - epnum &= 0x0f; + epnum &= 0x0f; + if (epnum >= MUSB_C_NUM_EPS) { + handled = -EINVAL; + break; + } + + if (is_in) ep = &musb->endpoints[epnum].ep_in; - } else { + else ep = &musb->endpoints[epnum].ep_out; - } regs = musb->endpoints[epnum].regs; - if (epnum >= MUSB_C_NUM_EPS || !ep->desc) { + if (!ep->desc) { handled = -EINVAL; break; } |