1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 0c934a195deb..1de4d3f87569 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/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