diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-10-22 22:15:00 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-10-31 14:04:24 +0100 |
| commit | e79cc615a9bb44da72c499ccfa2c9c4bbea3aa84 (patch) | |
| tree | 0b860852814460a151fe7323ae1d31726adbe18f /drivers/usb/gadget/f_ncm.c | |
| parent | usb: gadget: uac2: add some error recovery in afunc_bind() (diff) | |
| download | linux-e79cc615a9bb44da72c499ccfa2c9c4bbea3aa84.tar.xz linux-e79cc615a9bb44da72c499ccfa2c9c4bbea3aa84.zip | |
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_ncm.c')
| -rw-r--r-- | drivers/usb/gadget/f_ncm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c index 4f0950069a43..424fc3d1cc36 100644 --- a/drivers/usb/gadget/f_ncm.c +++ b/drivers/usb/gadget/f_ncm.c @@ -1259,9 +1259,9 @@ fail: /* we might as well release our claims on endpoints */ if (ncm->notify) ncm->notify->driver_data = NULL; - if (ncm->port.out_ep->desc) + if (ncm->port.out_ep) ncm->port.out_ep->driver_data = NULL; - if (ncm->port.in_ep->desc) + if (ncm->port.in_ep) ncm->port.in_ep->driver_data = NULL; ERROR(cdev, "%s: can't bind, err %d\n", f->name, status); |