diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-04 15:05:39 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-04 15:05:39 +0900 |
| commit | 00111076f725ec498f5ada19cdd984d111b0e9b3 (patch) | |
| tree | d7d08779bfc836382537c23298613f5948368bdc /drivers/usb/musb/musb_gadget_ep0.c | |
| parent | 133b170f08d6c20578f25b1ae71f80a5e638ccb6 (diff) | |
| parent | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 into sh/hwblk
Diffstat (limited to 'drivers/usb/musb/musb_gadget_ep0.c')
| -rw-r--r-- | drivers/usb/musb/musb_gadget_ep0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c index 40ed50ecedf..7a6778675ad 100644 --- a/drivers/usb/musb/musb_gadget_ep0.c +++ b/drivers/usb/musb/musb_gadget_ep0.c @@ -407,7 +407,7 @@ stall: csr |= MUSB_RXCSR_P_SENDSTALL | MUSB_RXCSR_FLUSHFIFO | MUSB_RXCSR_CLRDATATOG - | MUSB_TXCSR_P_WZC_BITS; + | MUSB_RXCSR_P_WZC_BITS; musb_writew(regs, MUSB_RXCSR, csr); } |