diff options
| author | Daniel Mack <zonque@gmail.com> | 2014-05-26 08:52:37 -0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-06-30 15:26:23 -0400 |
| commit | 2ccc6d30a0abf3e1a38f264e279428b846712e0f (patch) | |
| tree | cff5ade87b3d294a1cc5188af32fad5e06592607 | |
| parent | c03da38d5d4b28f6ab559c4df8646dbda536b674 (diff) | |
usb: musb: fix bit mask for CSR in musb_h_tx_flush_fifo()
The datasheet says that MUSB_TXCSR_FLUSHFIFO is only valid when
MUSB_TXCSR_TXPKTRDY is set as well.
With this patch applied, the warning in this function does no longer
kick in when an USB soundcard is unplugged while the stream is active.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/musb/musb_host.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 0745839d7cd8..3381fa56db29 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c | |||
| @@ -120,7 +120,7 @@ static void musb_h_tx_flush_fifo(struct musb_hw_ep *ep) | |||
| 120 | if (csr != lastcsr) | 120 | if (csr != lastcsr) |
| 121 | dev_dbg(musb->controller, "Host TX FIFONOTEMPTY csr: %02x\n", csr); | 121 | dev_dbg(musb->controller, "Host TX FIFONOTEMPTY csr: %02x\n", csr); |
| 122 | lastcsr = csr; | 122 | lastcsr = csr; |
| 123 | csr |= MUSB_TXCSR_FLUSHFIFO; | 123 | csr |= MUSB_TXCSR_FLUSHFIFO | MUSB_TXCSR_TXPKTRDY; |
| 124 | musb_writew(epio, MUSB_TXCSR, csr); | 124 | musb_writew(epio, MUSB_TXCSR, csr); |
| 125 | csr = musb_readw(epio, MUSB_TXCSR); | 125 | csr = musb_readw(epio, MUSB_TXCSR); |
| 126 | if (WARN(retries-- < 1, | 126 | if (WARN(retries-- < 1, |