diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-01-19 16:57:20 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-01-19 16:57:20 +0100 |
| commit | d1fc4440d761af47fd0c32661725011bf66ebb51 (patch) | |
| tree | d2fdfe049eac9b45a9418bd1be103297b1c0c55e /drivers/usb/dwc3/gadget.c | |
| parent | usb: musb: debugfs: improve copy_from_user() argument (diff) | |
| parent | Linux 3.19-rc5 (diff) | |
| download | linux-d1fc4440d761af47fd0c32661725011bf66ebb51.tar.xz linux-d1fc4440d761af47fd0c32661725011bf66ebb51.zip | |
Merge tag 'v3.19-rc5' into next
Linux 3.19-rc5
Conflicts:
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/udc/bdc/bdc_ep.c
Diffstat (limited to 'drivers/usb/dwc3/gadget.c')
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 4e2593993fae..6c5e344822b9 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -879,8 +879,7 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting) if (i == (request->num_mapped_sgs - 1) || sg_is_last(s)) { - if (list_is_last(&req->list, - &dep->request_list)) + if (list_empty(&dep->request_list)) last_one = true; chain = false; } @@ -898,6 +897,9 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting) if (last_one) break; } + + if (last_one) + break; } else { dma = req->request.dma; length = req->request.length; |