summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/f_eem.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-10-22 22:15:00 +0200
committerFelipe Balbi <balbi@ti.com>2012-10-31 15:04:24 +0200
commite79cc615a9bb44da72c499ccfa2c9c4bbea3aa84 (patch)
tree0b860852814460a151fe7323ae1d31726adbe18f /drivers/usb/gadget/f_eem.c
parent391aa852a372308c216d8638e57fe8fe560558f2 (diff)
downloadop-kernel-dev-e79cc615a9bb44da72c499ccfa2c9c4bbea3aa84.zip
op-kernel-dev-e79cc615a9bb44da72c499ccfa2c9c4bbea3aa84.tar.gz
usb: gadget: network: fix bind() error path
I think this is wrong since 72c973dd ("usb: gadget: add usb_endpoint_descriptor to struct usb_ep"). If we fail to allocate an ep or bail out early we shouldn't check for the descriptor which is assigned at ep_enable() time. Cc: Tatyana Brokhman <tlinder@codeaurora.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/f_eem.c')
-rw-r--r--drivers/usb/gadget/f_eem.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/gadget/f_eem.c b/drivers/usb/gadget/f_eem.c
index 1a7b2dd..a9cf2052 100644
--- a/drivers/usb/gadget/f_eem.c
+++ b/drivers/usb/gadget/f_eem.c
@@ -319,10 +319,9 @@ fail:
if (f->hs_descriptors)
usb_free_descriptors(f->hs_descriptors);
- /* we might as well release our claims on endpoints */
- if (eem->port.out_ep->desc)
+ if (eem->port.out_ep)
eem->port.out_ep->driver_data = NULL;
- if (eem->port.in_ep->desc)
+ if (eem->port.in_ep)
eem->port.in_ep->driver_data = NULL;
ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
OpenPOWER on IntegriCloud