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@xxxxxx> Cc: Felipe Balbi <felipe.balbi@xxxxxxxxx> CC: Ajay Gupta <ajay.gupta@xxxxxx> --- For the .36 merge window drivers/usb/musb/musbhsdma.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) Index: linux-2.6/drivers/usb/musb/musbhsdma.c =================================================================== --- linux-2.6.orig/drivers/usb/musb/musbhsdma.c +++ linux-2.6/drivers/usb/musb/musbhsdma.c @@ -173,10 +173,7 @@ static int dma_channel_program(struct dm musb_channel->max_packet_sz = packet_sz; channel->status = MUSB_DMA_STATUS_BUSY; - if ((mode == 1) && (len >= packet_sz)) - configure_channel(channel, packet_sz, 1, dma_addr, len); - else - configure_channel(channel, packet_sz, 0, dma_addr, len); + configure_channel(channel, packet_sz, mode, dma_addr, len); return true; } -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html