aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@nxp.com>2016-07-11 09:58:16 +0800
committerFelipe Balbi <felipe.balbi@linux.intel.com>2016-08-11 15:09:47 +0300
commit17a1dc5e22d25ba374d8c8dd8d5bf10bd20d3265 (patch)
tree05105553c37dd97d572545d3db3e2f0b8ed96565 /drivers/usb
parentusb: gadget: fsl_qe_udc: off by one in setup_received_handle() (diff)
downloadlinux-dev-17a1dc5e22d25ba374d8c8dd8d5bf10bd20d3265.tar.xz
linux-dev-17a1dc5e22d25ba374d8c8dd8d5bf10bd20d3265.zip
usb: udc: core: fix error handling
The udc device needs to be deleted if error occurs Fixes: 855ed04a3758 ("usb: gadget: udc-core: independent registration of gadgets and gadget drivers") Signed-off-by: Peter Chen <peter.chen@nxp.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/udc/core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index ff8685ea7219..934f83881c30 100644
--- 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 err4;
+ goto err5;
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);