From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Felipe Balbi <balbi@ti•com>, Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"John W. Linville" <linville@tuxdriver•com>,
Dan Carpenter <dan.carpenter@oracle•com>
Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Date: Tue, 13 Jan 2015 15:06:21 +1100 [thread overview]
Message-ID: <20150113150621.67d395ce@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
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 sfr@canb•auug.org.au
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;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-01-13 4:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 4:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-05-28 8:36 linux-next: manual merge of the usb-gadget tree with the usb.current tree Stephen Rothwell
2015-01-16 6:23 Stephen Rothwell
2015-01-16 9:56 ` Kaukab, Yousaf
2015-01-13 4:02 Stephen Rothwell
2014-09-08 7:09 Stephen Rothwell
2014-09-08 7:02 Stephen Rothwell
2014-09-08 13:27 ` Felipe Balbi
2014-07-04 4:51 Stephen Rothwell
2013-12-18 6:09 Stephen Rothwell
2013-07-30 4:08 Stephen Rothwell
2013-07-30 5:50 ` Felipe Balbi
2013-03-22 3:31 Stephen Rothwell
2013-03-22 6:28 ` Felipe Balbi
2013-03-22 3:28 Stephen Rothwell
2013-03-22 6:28 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150113150621.67d395ce@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@ti$(echo .)com \
--cc=dan.carpenter@oracle$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox