aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-01-25 05:51:19 -0500
committerFelipe Balbi <balbi@ti.com>2012-02-09 02:53:53 -0500
commit3cf0ad02e42a91e85ffe9bd67422dd266531d3ec (patch)
treeb31c5635d9a6b07c1e57a5d92a6ab536e2f7bd4a /drivers
parentd11519adc214c243ec606f186316f2667b677694 (diff)
usb: gadget: dummy_hcd: don't assign ->desc on error case
If the stream check fails then we leave ep->desc assigend but we return with an error code. The caller assumes the endpoint is not enabled (which is the case) but it can not enable it again due to this assigment. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/dummy_hcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 67573e5f2a18..9170a4c7ced4 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -514,7 +514,6 @@ static int dummy_enable(struct usb_ep *_ep,
514 } 514 }
515 515
516 _ep->maxpacket = max; 516 _ep->maxpacket = max;
517 ep->desc = desc;
518 if (usb_ss_max_streams(_ep->comp_desc)) { 517 if (usb_ss_max_streams(_ep->comp_desc)) {
519 if (!usb_endpoint_xfer_bulk(desc)) { 518 if (!usb_endpoint_xfer_bulk(desc)) {
520 dev_err(udc_dev(dum), "Can't enable stream support on " 519 dev_err(udc_dev(dum), "Can't enable stream support on "
@@ -523,6 +522,7 @@ static int dummy_enable(struct usb_ep *_ep,
523 } 522 }
524 ep->stream_en = 1; 523 ep->stream_en = 1;
525 } 524 }
525 ep->desc = desc;
526 526
527 dev_dbg(udc_dev(dum), "enabled %s (ep%d%s-%s) maxpacket %d stream %s\n", 527 dev_dbg(udc_dev(dum), "enabled %s (ep%d%s-%s) maxpacket %d stream %s\n",
528 _ep->name, 528 _ep->name,