From 06fa223affe837658a54312c5a3267aaf39059fd Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Wed, 31 Aug 2011 17:12:02 +0200 Subject: [PATCH] --- yaml --- r: 264985 b: refs/heads/master c: 78c58a53c9864447f2a46d4c06dd3c2616823ad2 h: refs/heads/master i: 264983: e1f20cd0c947d8684e6f31e5e5d6b97b7493d9e6 v: v3 --- [refs] | 2 +- trunk/drivers/usb/dwc3/gadget.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 965badffbd49..0e123b1a6f68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42077b0a3328792974b232691f5d0eb9dd644768 +refs/heads/master: 78c58a53c9864447f2a46d4c06dd3c2616823ad2 diff --git a/trunk/drivers/usb/dwc3/gadget.c b/trunk/drivers/usb/dwc3/gadget.c index 0c934a195deb..1de4d3f87569 100644 --- a/trunk/drivers/usb/dwc3/gadget.c +++ b/trunk/drivers/usb/dwc3/gadget.c @@ -61,6 +61,11 @@ void dwc3_map_buffer_to_dma(struct dwc3_request *req) { struct dwc3 *dwc = req->dep->dwc; + if (req->request.length == 0) { + /* req->request.dma = dwc->setup_buf_addr; */ + return; + } + if (req->request.dma == DMA_ADDR_INVALID) { req->request.dma = dma_map_single(dwc->dev, req->request.buf, req->request.length, req->direction @@ -78,6 +83,11 @@ void dwc3_unmap_buffer_from_dma(struct dwc3_request *req) { struct dwc3 *dwc = req->dep->dwc; + if (req->request.length == 0) { + req->request.dma = DMA_ADDR_INVALID; + return; + } + if (req->mapped) { dma_unmap_single(dwc->dev, req->request.dma, req->request.length, req->direction