1 files changed, 13 insertions, 7 deletions

diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index e6f04eee95c4..75c51ca4ee0f 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -812,6 +812,8 @@ int usb_gadget_map_request_by_dev(struct device *dev,
                         dev_err(dev, "failed to map buffer\n");
                         return -EFAULT;
                 }
+
+                req->dma_mapped = 1;
         }
 
         return 0;
@@ -836,9 +838,10 @@ void usb_gadget_unmap_request_by_dev(struct device *dev,
                                 is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
 
                 req->num_mapped_sgs = 0;
-        } else {
+        } else if (req->dma_mapped) {
                 dma_unmap_single(dev, req->dma, req->length,
                                 is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
+                req->dma_mapped = 0;
         }
 }
 EXPORT_SYMBOL_GPL(usb_gadget_unmap_request_by_dev);
@@ -1130,6 +1133,7 @@ static int check_pending_gadget_drivers(struct usb_udc *udc)
  * @release: a gadget release function.
  *
  * Returns zero on success, negative errno otherwise.
+ * Calls the gadget release function in the latter case.
  */
 int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
                 void (*release)(struct device *dev))
@@ -1137,10 +1141,6 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
         struct usb_udc          *udc;
         int                     ret = -ENOMEM;
 
-        udc = kzalloc(sizeof(*udc), GFP_KERNEL);
-        if (!udc)
-                goto err1;
-
         dev_set_name(&gadget->dev, "gadget");
         INIT_WORK(&gadget->work, usb_gadget_state_work);
         gadget->dev.parent = parent;
@@ -1150,7 +1150,13 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
         else
                 gadget->dev.release = usb_udc_nop_release;
 
-        ret = device_register(&gadget->dev);
+        device_initialize(&gadget->dev);
+
+        udc = kzalloc(sizeof(*udc), GFP_KERNEL);
+        if (!udc)
+                goto err1;
+
+        ret = device_add(&gadget->dev);
         if (ret)
                 goto err2;
 
@@ -1197,10 +1203,10 @@ err3:
         device_del(&gadget->dev);
 
 err2:
-        put_device(&gadget->dev);
         kfree(udc);
 
 err1:
+        put_device(&gadget->dev);
         return ret;
 }
 EXPORT_SYMBOL_GPL(usb_add_gadget_udc_release);