diff options
| author | Neil Zhang <zhangwm@marvell.com> | 2011-10-12 10:49:37 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-10-13 19:42:07 +0200 |
| commit | 46e172dfb38c9dad2ea52d8c161834c1f0bd2473 (patch) | |
| tree | c78c5e869b9dfe5647f94b77a33c9f90faeb7f7f /drivers/usb/gadget | |
| parent | usb: gadget: mv_udc: fix dtd dma confusion (diff) | |
| download | linux-46e172dfb38c9dad2ea52d8c161834c1f0bd2473.tar.xz linux-46e172dfb38c9dad2ea52d8c161834c1f0bd2473.zip | |
usb: gadget: mv_udc: use DMA API for status_req's dma address
use DMA API for status_req's dma address, it is needed by dtd.
Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/mv_udc_core.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c index 9d960f1f7c7f..1f47d03d6871 100644 --- a/drivers/usb/gadget/mv_udc_core.c +++ b/drivers/usb/gadget/mv_udc_core.c @@ -1385,6 +1385,13 @@ udc_prime_status(struct mv_udc *udc, u8 direction, u16 status, bool empty) req->req.complete = NULL; req->dtd_count = 0; + if (req->req.dma == DMA_ADDR_INVALID) { + req->req.dma = dma_map_single(ep->udc->gadget.dev.parent, + req->req.buf, req->req.length, + ep_dir(ep) ? DMA_TO_DEVICE : DMA_FROM_DEVICE); + req->mapped = 1; + } + /* prime the data phase */ if (!req_to_dtd(req)) retval = queue_dtd(ep, req); @@ -2115,7 +2122,7 @@ static int __devinit mv_udc_probe(struct platform_device *dev) /* allocate a small amount of memory to get valid address */ udc->status_req->req.buf = kzalloc(8, GFP_KERNEL); - udc->status_req->req.dma = virt_to_phys(udc->status_req->req.buf); + udc->status_req->req.dma = DMA_ADDR_INVALID; udc->resume_state = USB_STATE_NOTATTACHED; udc->usb_state = USB_STATE_POWERED; |