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,
Robert Baldyga <r.baldyga@samsung.com>,
Mian Yousaf Kaukab <yousaf.kaukab@intel.com>
Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Date: Fri, 16 Jan 2015 17:23:46 +1100 [thread overview]
Message-ID: <20150116172346.4add4867@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 ("usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()") from the
usb.current tree and commit c6f5c050e2a7 ("usb: dwc2: gadget: add
bi-directional endpoint support") and 1141ea01d5fa ("usb: dwc2: gadget:
kill requests after disabling ep") from the usb-gadget tree.
I fixed it up (I think - 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/dwc2/gadget.c
index 79242008085b,882a1a8953f5..000000000000
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@@ -2927,8 -2960,12 +2964,12 @@@ static int s3c_hsotg_udc_stop(struct us
mutex_lock(&hsotg->init_mutex);
/* all endpoints should be shutdown */
- for (ep = 1; ep < hsotg->num_of_eps; ep++)
- s3c_hsotg_ep_disable_force(&hsotg->eps[ep].ep, true);
+ for (ep = 1; ep < hsotg->num_of_eps; ep++) {
+ if (hsotg->eps_in[ep])
- s3c_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
++ s3c_hsotg_ep_disable_force(&hsotg->eps_in[ep]->ep, true);
+ if (hsotg->eps_out[ep])
- s3c_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
++ s3c_hsotg_ep_disable_force(&hsotg->eps_out[ep]->ep, true);
+ }
spin_lock_irqsave(&hsotg->lock, flags);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-01-16 6:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-16 6:23 Stephen Rothwell [this message]
2015-01-16 9:56 ` linux-next: manual merge of the usb-gadget tree with the usb.current tree Kaukab, Yousaf
-- strict thread matches above, loose matches on Subject: below --
2015-05-28 8:36 Stephen Rothwell
2015-01-13 4:06 Stephen Rothwell
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=20150116172346.4add4867@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@ti.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=r.baldyga@samsung.com \
--cc=yousaf.kaukab@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).