projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[cascardo/linux.git]
/
drivers
/
usb
/
gadget
/
omap_udc.c
diff --git
a/drivers/usb/gadget/omap_udc.c
b/drivers/usb/gadget/omap_udc.c
index
f28ebbc
..
2de9748
100644
(file)
--- a/
drivers/usb/gadget/omap_udc.c
+++ b/
drivers/usb/gadget/omap_udc.c
@@
-772,7
+772,7
@@
static void dma_error(int lch, u16 ch_status, void *data)
struct omap_ep *ep = data;
/* if ch_status & OMAP_DMA_DROP_IRQ ... */
struct omap_ep *ep = data;
/* if ch_status & OMAP_DMA_DROP_IRQ ... */
- /* if ch_status & OMAP_DMA_TOUT_IRQ ... */
+ /* if ch_status & OMAP
1
_DMA_TOUT_IRQ ... */
ERR("%s dma error, lch %d status %02x\n", ep->ep.name, lch, ch_status);
/* complete current transfer ... */
ERR("%s dma error, lch %d status %02x\n", ep->ep.name, lch, ch_status);
/* complete current transfer ... */