Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 13 Jan 2015 15:06:21 +1100

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc/bdc/bdc_ep.c between commit f26d29e34e20 ("usb:
gadget: udc: avoid dereference before NULL check in ep_queue") from the
usb.current tree and commit d71b0d7764a7 ("usb: gadget: udc: remove
bogus NULL check") from the usb-gadget tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/usb/gadget/udc/bdc/bdc_ep.c
index d4fe8d769bd6,fdc0e9fc39d0..000000000000
--- a/drivers/usb/gadget/udc/bdc/bdc_ep.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c
@@@ -718,11 -718,10 +718,11 @@@ static int ep_queue(struct bdc_ep *ep, 
  	struct bdc *bdc;
  	int ret = 0;
  
- 	if (!req || !ep || !ep->usb_ep.desc)
 -	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;