diff options
author | Felipe Balbi | 2014-09-08 21:39:01 +0200 |
---|---|---|
committer | Felipe Balbi | 2014-09-08 21:39:01 +0200 |
commit | f7cc38b16e2741186253be3dff61a9d124112126 (patch) | |
tree | efce170d7c0c4baf6924275e6a42d11fa47c9290 /drivers/usb/gadget/udc/atmel_usba_udc.c | |
parent | usb: gadget: uvc: move module parameters from f_uvc (diff) | |
parent | Linux 3.17-rc4 (diff) | |
download | kernel-qcow2-linux-f7cc38b16e2741186253be3dff61a9d124112126.tar.gz kernel-qcow2-linux-f7cc38b16e2741186253be3dff61a9d124112126.tar.xz kernel-qcow2-linux-f7cc38b16e2741186253be3dff61a9d124112126.zip |
Merge tag 'v3.17-rc4' into next
Merge Linux 3.17-rc4 here so we have all the latest
fixes on next too. This also cleans up a few conflicts
when applying patches.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/gadget/Makefile
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/legacy/Makefile
drivers/usb/phy/phy-samsung-usb.h
Diffstat (limited to 'drivers/usb/gadget/udc/atmel_usba_udc.c')
-rw-r--r-- | drivers/usb/gadget/udc/atmel_usba_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index 906e65f0e4fa..c9fe67e29d35 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) if (dma_status) { int i; - for (i = 1; i < USBA_NR_DMAS; i++) + for (i = 1; i <= USBA_NR_DMAS; i++) if (dma_status & (1 << i)) usba_dma_irq(udc, &udc->usba_ep[i]); } |