diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:57:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:02:14 -0400 |
| commit | 71f6424023cb9fa381efc7237ca05926b2b1ca9a (patch) | |
| tree | 6c3c4a2110d0ff3d73c4bacaddb23b9295663695 /drivers/usb/musb/da8xx.c | |
| parent | 9bc128e16bb82c046d6972171de572affc5c4cbf (diff) | |
| parent | e933a1a12a02f42e0013cda87bba37ccb59efc47 (diff) | |
Merge branch 'mxs/cleanup' into next/multiplatform
This is a dependency for mxs/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/Makefile
Diffstat (limited to 'drivers/usb/musb/da8xx.c')
| -rw-r--r-- | drivers/usb/musb/da8xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 7c71769d71ff..41613a2b35e8 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c | |||
| @@ -327,7 +327,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) | |||
| 327 | u8 devctl = musb_readb(mregs, MUSB_DEVCTL); | 327 | u8 devctl = musb_readb(mregs, MUSB_DEVCTL); |
| 328 | int err; | 328 | int err; |
| 329 | 329 | ||
| 330 | err = musb->int_usb & USB_INTR_VBUSERROR; | 330 | err = musb->int_usb & MUSB_INTR_VBUSERROR; |
| 331 | if (err) { | 331 | if (err) { |
| 332 | /* | 332 | /* |
| 333 | * The Mentor core doesn't debounce VBUS as needed | 333 | * The Mentor core doesn't debounce VBUS as needed |