Modified: trunk/drivers/usb/musb/musb_gadget.c (7363 => 7364)
--- trunk/drivers/usb/musb/musb_gadget.c 2009-09-16 18:21:22 UTC (rev 7363)
+++ trunk/drivers/usb/musb/musb_gadget.c 2009-09-16 23:02:01 UTC (rev 7364)
@@ -520,8 +520,9 @@
| MUSB_TXCSR_TXPKTRDY);
request->zero = 0;
}
- if (request->actual < request->length)
- break;
+ if (request->actual < request->length)
+ break;
+
/* ... or if not, then complete it */
musb_g_giveback(musb_ep, request, 0);
@@ -930,10 +931,10 @@
* likewise high bandwidth periodic tx
*/
#if defined(CONFIG_BLACKFIN) && ANOMALY_05000450
- /* Set TXMAXP with the FIFO size of the endpoint
- * to diable double buffer mode.
- */
- musb_writew(regs, MUSB_TXMAXP, hw_ep->max_packet_sz_tx);
+ /* Set TXMAXP with the FIFO size of the endpoint
+ * to diable double buffer mode.
+ */
+ musb_writew(regs, MUSB_TXMAXP, hw_ep->max_packet_sz_tx);
#else
musb_writew(regs, MUSB_TXMAXP, tmp);
#endif
@@ -967,14 +968,14 @@
* likewise high bandwidth periodic rx
*/
#if defined(CONFIG_BLACKFIN) && ANOMALY_05000465
- /* Set RXMAXP with the FIFO size of the endpoint
- * to diable double buffer mode.
- */
- musb_writew(regs, MUSB_RXMAXP, hw_ep->max_packet_sz_rx);
+ /* Set RXMAXP with the FIFO size of the endpoint
+ * to diable double buffer mode.
+ */
+ musb_writew(regs, MUSB_RXMAXP, hw_ep->max_packet_sz_rx);
#else
+ musb_writew(regs, MUSB_RXMAXP, tmp);
+#endif
- musb_writew(regs, MUSB_RXMAXP, tmp);
-#endif
/* force shared fifo to OUT-only mode */
if (hw_ep->is_shared_fifo) {
csr = musb_readw(regs, MUSB_TXCSR);
Modified: trunk/drivers/usb/musb/musb_host.c (7363 => 7364)
--- trunk/drivers/usb/musb/musb_host.c 2009-09-16 18:21:22 UTC (rev 7363)
+++ trunk/drivers/usb/musb/musb_host.c 2009-09-16 23:02:01 UTC (rev 7364)
@@ -793,9 +793,8 @@
| ((hw_ep->max_packet_sz_tx /
packet_sz) - 1) << 11);
else
- musb_writew(epio, MUSB_TXMAXP,
+ musb_writew(epio, MUSB_TXMAXP,
packet_sz);
-
musb_writeb(epio, MUSB_TXINTERVAL, qh->intv_reg);
} else {
musb_writeb(epio, MUSB_NAKLIMIT0, qh->intv_reg);
Modified: trunk/drivers/usb/musb/musbhsdma.c (7363 => 7364)
--- trunk/drivers/usb/musb/musbhsdma.c 2009-09-16 18:21:22 UTC (rev 7363)
+++ trunk/drivers/usb/musb/musbhsdma.c 2009-09-16 23:02:01 UTC (rev 7364)
@@ -258,10 +258,12 @@
int_hsdma = musb_readb(mbase, MUSB_HSDMA_INTR);
if (!int_hsdma)
goto done;
+
#ifdef CONFIG_BLACKFIN
- /* Clear DMA interrup flags */
+ /* Clear DMA interrupt flags */
musb_writeb(mbase, MUSB_HSDMA_INTR, int_hsdma);
#endif
+
for (bchannel = 0; bchannel < MUSB_HSDMA_CHANNELS; bchannel++) {
if (int_hsdma & (1 << bchannel)) {
musb_channel = (struct musb_dma_channel *)
@@ -327,7 +329,6 @@
}
}
-
retval = IRQ_HANDLED;
done:
spin_unlock_irqrestore(&musb->lock, flags);
