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 18da4873e52e..91a5027b5c1f 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -89,15 +89,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;
                 }