Merge tag 'v3.19-rc5' into next
Linux 3.19-rc5 Conflicts: drivers/usb/dwc2/gadget.c drivers/usb/gadget/udc/bdc/bdc_ep.c
This commit is contained in:
@@ -718,10 +718,11 @@ static int ep_queue(struct bdc_ep *ep, struct bdc_req *req)
|
||||
struct bdc *bdc;
|
||||
int ret = 0;
|
||||
|
||||
bdc = ep->bdc;
|
||||
if (!req || !ep->usb_ep.desc)
|
||||
return -EINVAL;
|
||||
|
||||
bdc = ep->bdc;
|
||||
|
||||
req->usb_req.actual = 0;
|
||||
req->usb_req.status = -EINPROGRESS;
|
||||
req->epnum = ep->ep_num;
|
||||
|
Reference in New Issue
Block a user