projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-vc4-fixes-2016-09-14' of https://github.com/anholt/linux into drm...
[linux-2.6-block.git]
/
drivers
/
usb
/
gadget
/
udc
/
core.c
diff --git
a/drivers/usb/gadget/udc/core.c
b/drivers/usb/gadget/udc/core.c
index ff8685ea721936e3a67f63c0d44d0ec0ae4d943b..934f83881c3074250d9117df691463cddb61ca0c 100644
(file)
--- a/
drivers/usb/gadget/udc/core.c
+++ b/
drivers/usb/gadget/udc/core.c
@@
-1145,7
+1145,7
@@
int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
if (ret != -EPROBE_DEFER)
list_del(&driver->pending);
if (ret)
- goto err
4
;
+ goto err
5
;
break;
}
}
@@
-1154,6
+1154,9
@@
int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
return 0;
+err5:
+ device_del(&udc->dev);
+
err4:
list_del(&udc->list);
mutex_unlock(&udc_lock);