diff --git a/[refs] b/[refs] index 6a714eadea71..4ccc87b6b795 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d11519adc214c243ec606f186316f2667b677694 +refs/heads/master: 3cf0ad02e42a91e85ffe9bd67422dd266531d3ec diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c index 67573e5f2a18..9170a4c7ced4 100644 --- a/trunk/drivers/usb/gadget/dummy_hcd.c +++ b/trunk/drivers/usb/gadget/dummy_hcd.c @@ -514,7 +514,6 @@ static int dummy_enable(struct usb_ep *_ep, } _ep->maxpacket = max; - ep->desc = desc; if (usb_ss_max_streams(_ep->comp_desc)) { if (!usb_endpoint_xfer_bulk(desc)) { dev_err(udc_dev(dum), "Can't enable stream support on " @@ -523,6 +522,7 @@ static int dummy_enable(struct usb_ep *_ep, } ep->stream_en = 1; } + ep->desc = desc; dev_dbg(udc_dev(dum), "enabled %s (ep%d%s-%s) maxpacket %d stream %s\n", _ep->name,