diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-28 09:30:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-28 09:30:32 -0500 |
| commit | 41ca5d4e9be11ea6ae040b51d9628a189fd82896 (patch) | |
| tree | f9c35cc37b9622f6cccd91b94548f44b9a534029 /drivers/usb/dwc3/gadget.c | |
| parent | 0fcedc8631ec28ca25d3c0b116e8fa0c19dd5f6d (diff) | |
| parent | 3669ef9fa7d35f573ec9c0e0341b29251c2734a7 (diff) | |
Merge commit 3669ef9fa7d3 ("x86, tls: Interpret an all-zero struct user_desc as 'no segment'") into x86/asm
Pick up the latestest asm fixes before advancing it any further.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 f03b136ecfce..8f65ab3a3b92 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c | |||
| @@ -882,8 +882,7 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting) | |||
| 882 | 882 | ||
| 883 | if (i == (request->num_mapped_sgs - 1) || | 883 | if (i == (request->num_mapped_sgs - 1) || |
| 884 | sg_is_last(s)) { | 884 | sg_is_last(s)) { |
| 885 | if (list_is_last(&req->list, | 885 | if (list_empty(&dep->request_list)) |
| 886 | &dep->request_list)) | ||
| 887 | last_one = true; | 886 | last_one = true; |
| 888 | chain = false; | 887 | chain = false; |
| 889 | } | 888 | } |
| @@ -901,6 +900,9 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting) | |||
| 901 | if (last_one) | 900 | if (last_one) |
| 902 | break; | 901 | break; |
| 903 | } | 902 | } |
| 903 | |||
| 904 | if (last_one) | ||
| 905 | break; | ||
| 904 | } else { | 906 | } else { |
| 905 | dma = req->request.dma; | 907 | dma = req->request.dma; |
| 906 | length = req->request.length; | 908 | length = req->request.length; |
