diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 03:49:51 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 03:49:51 -0400 |
| commit | 2d0b579a9831c927bcebf5f61055e7462f0af2dc (patch) | |
| tree | 3181c183b463e745601b1f4efda0f8fff3f1c08b /drivers/usb/musb/tusb6010_omap.c | |
| parent | e80ca144ea902efa7aed446780fd9fad421fd8d3 (diff) | |
| parent | 671ee7f0ce62e4b991b47fcf1c161c3f710dabbc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-fixes-for-linus
Diffstat (limited to 'drivers/usb/musb/tusb6010_omap.c')
| -rw-r--r-- | drivers/usb/musb/tusb6010_omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index c784e6c03aac..07c8a73dfe41 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c | |||
| @@ -89,7 +89,7 @@ static inline int tusb_omap_use_shared_dmareq(struct tusb_omap_dma_ch *chdat) | |||
| 89 | u32 reg = musb_readl(chdat->tbase, TUSB_DMA_EP_MAP); | 89 | u32 reg = musb_readl(chdat->tbase, TUSB_DMA_EP_MAP); |
| 90 | 90 | ||
| 91 | if (reg != 0) { | 91 | if (reg != 0) { |
| 92 | dev_dbg(musb->controller, "ep%i dmareq0 is busy for ep%i\n", | 92 | dev_dbg(chdat->musb->controller, "ep%i dmareq0 is busy for ep%i\n", |
| 93 | chdat->epnum, reg & 0xf); | 93 | chdat->epnum, reg & 0xf); |
| 94 | return -EAGAIN; | 94 | return -EAGAIN; |
| 95 | } | 95 | } |