Explorar el Código

usb: dwc3: ep0: split the special cases on ep0_queue

We can return early from each if () branch
and split the special cases for clarity. While
at that also add a comment to the delayed_status
case.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Felipe Balbi hace 13 años
padre
commit
d9b33c605c
Se han modificado 1 ficheros con 11 adiciones y 1 borrados
  1. 11 1
      drivers/usb/dwc3/ep0.c

+ 11 - 1
drivers/usb/dwc3/ep0.c

@@ -155,13 +155,23 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
 
 
 		dep->flags &= ~(DWC3_EP_PENDING_REQUEST |
 		dep->flags &= ~(DWC3_EP_PENDING_REQUEST |
 				DWC3_EP0_DIR_IN);
 				DWC3_EP0_DIR_IN);
-	} else if (dwc->delayed_status) {
+
+		return 0;
+	}
+
+	/*
+	 * In case gadget driver asked us to delay the STATUS phase,
+	 * handle it here.
+	 */
+	if (dwc->delayed_status) {
 		dwc->delayed_status = false;
 		dwc->delayed_status = false;
 
 
 		if (dwc->ep0state == EP0_STATUS_PHASE)
 		if (dwc->ep0state == EP0_STATUS_PHASE)
 			__dwc3_ep0_do_control_status(dwc, dwc->eps[1]);
 			__dwc3_ep0_do_control_status(dwc, dwc->eps[1]);
 		else
 		else
 			dev_dbg(dwc->dev, "too early for delayed status\n");
 			dev_dbg(dwc->dev, "too early for delayed status\n");
+
+		return 0;
 	}
 	}
 
 
 	return 0;
 	return 0;