git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'usb-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...
[pandora-kernel.git]
/
drivers
/
usb
/
musb
/
da8xx.c
diff --git
a/drivers/usb/musb/da8xx.c
b/drivers/usb/musb/da8xx.c
index
ea7e591
..
b903b74
100644
(file)
--- 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)
u8 devctl = musb_readb(mregs, MUSB_DEVCTL);
int err;
- err = musb->int_usb & USB_INTR_VBUSERROR;
+ err = musb->int_usb &
M
USB_INTR_VBUSERROR;
if (err) {
/*
* The Mentor core doesn't debounce VBUS as needed