diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-10-22 16:15:04 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-10-31 09:05:55 -0400 |
commit | d0eca719dd11ad0619e8dd6a1f3eceb95b0216dd (patch) | |
tree | 7b949cdc122534323aef524f886d3b55b3647b0a /drivers/usb/gadget/f_phonet.c | |
parent | 7f2a9268b458b693160f02f0df2bafb83e128750 (diff) |
usb: gadget: phonet: free requests in pn_bind()'s error path
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_phonet.c')
-rw-r--r-- | drivers/usb/gadget/f_phonet.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c index 8ee9268fe253..a6c19a486d53 100644 --- a/drivers/usb/gadget/f_phonet.c +++ b/drivers/usb/gadget/f_phonet.c | |||
@@ -531,7 +531,7 @@ int pn_bind(struct usb_configuration *c, struct usb_function *f) | |||
531 | 531 | ||
532 | req = usb_ep_alloc_request(fp->out_ep, GFP_KERNEL); | 532 | req = usb_ep_alloc_request(fp->out_ep, GFP_KERNEL); |
533 | if (!req) | 533 | if (!req) |
534 | goto err; | 534 | goto err_req; |
535 | 535 | ||
536 | req->complete = pn_rx_complete; | 536 | req->complete = pn_rx_complete; |
537 | fp->out_reqv[i] = req; | 537 | fp->out_reqv[i] = req; |
@@ -540,14 +540,18 @@ int pn_bind(struct usb_configuration *c, struct usb_function *f) | |||
540 | /* Outgoing USB requests */ | 540 | /* Outgoing USB requests */ |
541 | fp->in_req = usb_ep_alloc_request(fp->in_ep, GFP_KERNEL); | 541 | fp->in_req = usb_ep_alloc_request(fp->in_ep, GFP_KERNEL); |
542 | if (!fp->in_req) | 542 | if (!fp->in_req) |
543 | goto err; | 543 | goto err_req; |
544 | 544 | ||
545 | INFO(cdev, "USB CDC Phonet function\n"); | 545 | INFO(cdev, "USB CDC Phonet function\n"); |
546 | INFO(cdev, "using %s, OUT %s, IN %s\n", cdev->gadget->name, | 546 | INFO(cdev, "using %s, OUT %s, IN %s\n", cdev->gadget->name, |
547 | fp->out_ep->name, fp->in_ep->name); | 547 | fp->out_ep->name, fp->in_ep->name); |
548 | return 0; | 548 | return 0; |
549 | 549 | ||
550 | err_req: | ||
551 | for (i = 0; i < phonet_rxq_size && fp->out_reqv[i]; i++) | ||
552 | usb_ep_free_request(fp->out_ep, fp->out_reqv[i]); | ||
550 | err: | 553 | err: |
554 | |||
551 | if (fp->out_ep) | 555 | if (fp->out_ep) |
552 | fp->out_ep->driver_data = NULL; | 556 | fp->out_ep->driver_data = NULL; |
553 | if (fp->in_ep) | 557 | if (fp->in_ep) |