Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 827e376bfa97..75e6cb044eb2 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -990,6 +990,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                                          DWC3_TRBCTL_CONTROL_DATA,
                                          true);
 
+                req->trb = &dwc->ep0_trb[dep->trb_enqueue - 1];
+
                 /* Now prepare one extra TRB to align transfer size */
                 dwc3_ep0_prepare_one_trb(dep, dwc->bounce_addr,
                                          maxpacket - rem,
@@ -1015,6 +1017,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                                          DWC3_TRBCTL_CONTROL_DATA,
                                          true);
 
+                req->trb = &dwc->ep0_trb[dep->trb_enqueue - 1];
+
                 /* Now prepare one extra TRB to align transfer size */
                 dwc3_ep0_prepare_one_trb(dep, dwc->bounce_addr,
                                          0, DWC3_TRBCTL_CONTROL_DATA,
@@ -1029,6 +1033,9 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                 dwc3_ep0_prepare_one_trb(dep, req->request.dma,
                                 req->request.length, DWC3_TRBCTL_CONTROL_DATA,
                                 false);
+
+                req->trb = &dwc->ep0_trb[dep->trb_enqueue];
+
                 ret = dwc3_ep0_start_trans(dep);
         }