aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnand Gadiyar <gadiyar@ti.com>2010-07-08 07:04:55 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 17:35:39 -0400
commit8ca47c8a7621835914c053caaec74e66147dd7dc (patch)
tree21b329b59fcccdb77d4282e91584047ab0d3f42f
parent3f1a9696aed6814601078f3c430a8e432b625c66 (diff)
USB: musb: do not override DMA mode in channel program
There is no reason for the DMA channel program to override the DMA mode passed down by its caller. Use the passed parameter directly, and let the caller handle the decision on which mode is to be used. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/musb/musbhsdma.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index dc66e4376d4..6dc107f2524 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -173,10 +173,7 @@ static int dma_channel_program(struct dma_channel *channel,
173 musb_channel->max_packet_sz = packet_sz; 173 musb_channel->max_packet_sz = packet_sz;
174 channel->status = MUSB_DMA_STATUS_BUSY; 174 channel->status = MUSB_DMA_STATUS_BUSY;
175 175
176 if ((mode == 1) && (len >= packet_sz)) 176 configure_channel(channel, packet_sz, mode, dma_addr, len);
177 configure_channel(channel, packet_sz, 1, dma_addr, len);
178 else
179 configure_channel(channel, packet_sz, 0, dma_addr, len);
180 177
181 return true; 178 return true;
182} 179}