From 84e68a3a02a49b54dfff9ad933dd6ec0a45e83ab Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Thu, 28 May 2009 10:10:44 +0900 Subject: [PATCH] --- yaml --- r: 151381 b: refs/heads/master c: 9b8e7ba68ad0e4273f4897950de65bc311552cd1 h: refs/heads/master i: 151379: 76e21c136d580160b4781521f663a2bc43bab7f4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/usb.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a7636ef44853..1759625e1ef8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b18ffd49e86102a9ed0a1cc83fdafe3891e844e5 +refs/heads/master: 9b8e7ba68ad0e4273f4897950de65bc311552cd1 diff --git a/trunk/drivers/usb/core/usb.c b/trunk/drivers/usb/core/usb.c index c32811ae128f..020b58528d90 100644 --- a/trunk/drivers/usb/core/usb.c +++ b/trunk/drivers/usb/core/usb.c @@ -799,12 +799,12 @@ void usb_buffer_dmasync(struct urb *urb) return; if (controller->dma_mask) { - dma_sync_single(controller, + dma_sync_single_for_cpu(controller, urb->transfer_dma, urb->transfer_buffer_length, usb_pipein(urb->pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); if (usb_pipecontrol(urb->pipe)) - dma_sync_single(controller, + dma_sync_single_for_cpu(controller, urb->setup_dma, sizeof(struct usb_ctrlrequest), DMA_TO_DEVICE); @@ -922,8 +922,8 @@ void usb_buffer_dmasync_sg(const struct usb_device *dev, int is_in, || !controller->dma_mask) return; - dma_sync_sg(controller, sg, n_hw_ents, - is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE); + dma_sync_sg_for_cpu(controller, sg, n_hw_ents, + is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE); } EXPORT_SYMBOL_GPL(usb_buffer_dmasync_sg); #endif