1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index 0445da0a5a0c..e71240b386b4 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -234,9 +234,11 @@ static int cdns3_req_ep0_set_address(struct cdns3_device *priv_dev,
 static int cdns3_req_ep0_get_status(struct cdns3_device *priv_dev,
                                     struct usb_ctrlrequest *ctrl)
 {
+        struct cdns3_endpoint *priv_ep;
         __le16 *response_pkt;
         u16 usb_status = 0;
         u32 recip;
+        u8 index;
 
         recip = ctrl->bRequestType & USB_RECIP_MASK;
 
@@ -262,9 +264,13 @@ static int cdns3_req_ep0_get_status(struct cdns3_device *priv_dev,
         case USB_RECIP_INTERFACE:
                 return cdns3_ep0_delegate_req(priv_dev, ctrl);
         case USB_RECIP_ENDPOINT:
-                /* check if endpoint is stalled */
+                index = cdns3_ep_addr_to_index(ctrl->wIndex);
+                priv_ep = priv_dev->eps[index];
+
+                /* check if endpoint is stalled or stall is pending */
                 cdns3_select_ep(priv_dev, ctrl->wIndex);
-                if (EP_STS_STALL(readl(&priv_dev->regs->ep_sts)))
+                if (EP_STS_STALL(readl(&priv_dev->regs->ep_sts)) ||
+                    (priv_ep->flags & EP_STALL_PENDING))
                         usb_status =  BIT(USB_ENDPOINT_HALT);
                 break;
         default: