diff options
Diffstat (limited to 'drivers/usb/musb/musb_host.c')
-rw-r--r-- | drivers/usb/musb/musb_host.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 795a45b1b25b..58487a473521 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c | |||
@@ -662,7 +662,7 @@ static int musb_tx_dma_set_mode_mentor(struct dma_controller *dma, | |||
662 | csr &= ~(MUSB_TXCSR_AUTOSET | MUSB_TXCSR_DMAMODE); | 662 | csr &= ~(MUSB_TXCSR_AUTOSET | MUSB_TXCSR_DMAMODE); |
663 | csr |= MUSB_TXCSR_DMAENAB; /* against programmer's guide */ | 663 | csr |= MUSB_TXCSR_DMAENAB; /* against programmer's guide */ |
664 | } | 664 | } |
665 | channel->desired_mode = mode; | 665 | channel->desired_mode = *mode; |
666 | musb_writew(epio, MUSB_TXCSR, csr); | 666 | musb_writew(epio, MUSB_TXCSR, csr); |
667 | 667 | ||
668 | return 0; | 668 | return 0; |
@@ -2003,10 +2003,8 @@ void musb_host_rx(struct musb *musb, u8 epnum) | |||
2003 | qh->offset, | 2003 | qh->offset, |
2004 | urb->transfer_buffer_length); | 2004 | urb->transfer_buffer_length); |
2005 | 2005 | ||
2006 | done = musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, | 2006 | if (musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, urb, |
2007 | urb, xfer_len, | 2007 | xfer_len, iso_err)) |
2008 | iso_err); | ||
2009 | if (done) | ||
2010 | goto finish; | 2008 | goto finish; |
2011 | else | 2009 | else |
2012 | dev_err(musb->controller, "error: rx_dma failed\n"); | 2010 | dev_err(musb->controller, "error: rx_dma failed\n"); |