summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-03 23:35:13 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-03 23:35:13 +0200
commit0f79fd807a248d80211f9c5a5317ab9de21a9d59 (patch)
tree0e946e54b0ea1d516b6d416ce3a182601982cba0 /drivers/usb
parentMerge tag 'usb-serial-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentusb: udc: core: add device_del() call to error pathway (diff)
downloadlinux-0f79fd807a248d80211f9c5a5317ab9de21a9d59.tar.xz
linux-0f79fd807a248d80211f9c5a5317ab9de21a9d59.zip
Merge tag 'fixes-for-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes: usb: fixes for v4.2-rc6 Just one major fix which has been pending since January. Somehow it fell through the cracks, but here it is. Basically, this fixes a bug in udc-core when gadget registration fails. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/udc/udc-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 362ee8af5fce..89ed5e71a199 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -323,6 +323,7 @@ err4:
err3:
put_device(&udc->dev);
+ device_del(&gadget->dev);
err2:
put_device(&gadget->dev);