| Message ID | 20190627205240.38366-9-john.stultz@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix scheduling while atomic in dwc3_gadget_ep_dequeue | expand |
Hi John, On Thu, Jun 27, 2019 at 08:52:39PM +0000, John Stultz wrote: > This reverts commit 25ad17d692ad54c3c33b2a31e5ce2a82e38de14e, > as with other patches backported to -stable, we can now apply > the actual upstream commit that matches this. > > Cc: Fei Yang <fei.yang@intel.com> > Cc: Sam Protsenko <semen.protsenko@linaro.org> > Cc: Felipe Balbi <balbi@kernel.org> > Cc: linux-usb@vger.kernel.org > Cc: stable@vger.kernel.org # 4.19.y > Signed-off-by: John Stultz <john.stultz@linaro.org> > --- > drivers/usb/dwc3/gadget.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c > index 879f652c5580..843586f20572 100644 > --- a/drivers/usb/dwc3/gadget.c > +++ b/drivers/usb/dwc3/gadget.c > @@ -177,8 +177,6 @@ static void dwc3_gadget_del_and_unmap_request(struct dwc3_ep *dep, > req->started = false; > list_del(&req->list); > req->remaining = 0; > - req->unaligned = false; > - req->zero = false; Given that these structure members are removed in Patch 1/9, wouldn't having these lines remain until this revert patch present compilation errors when applying the patches in this series individually? For bisectability would it be better to fix-up Patch 1 to also convert these two flags to req->needs_extra_trb in one shot? Alternatively you could sandwich Patch 1 between Patch 8 & 9. Thanks, Jack
On Thu, Jun 27, 2019 at 10:54 PM Jack Pham <jackp@codeaurora.org> wrote: > On Thu, Jun 27, 2019 at 08:52:39PM +0000, John Stultz wrote: > > diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c > > index 879f652c5580..843586f20572 100644 > > --- a/drivers/usb/dwc3/gadget.c > > +++ b/drivers/usb/dwc3/gadget.c > > @@ -177,8 +177,6 @@ static void dwc3_gadget_del_and_unmap_request(struct dwc3_ep *dep, > > req->started = false; > > list_del(&req->list); > > req->remaining = 0; > > - req->unaligned = false; > > - req->zero = false; > > Given that these structure members are removed in Patch 1/9, wouldn't > having these lines remain until this revert patch present compilation > errors when applying the patches in this series individually? > > For bisectability would it be better to fix-up Patch 1 to also convert > these two flags to req->needs_extra_trb in one shot? Alternatively you > could sandwich Patch 1 between Patch 8 & 9. Ah. Good point! I'll respin this. Thanks for looking this over! thanks -john
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 879f652c5580..843586f20572 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -177,8 +177,6 @@ static void dwc3_gadget_del_and_unmap_request(struct dwc3_ep *dep, req->started = false; list_del(&req->list); req->remaining = 0; - req->unaligned = false; - req->zero = false; if (req->request.status == -EINPROGRESS) req->request.status = status;
This reverts commit 25ad17d692ad54c3c33b2a31e5ce2a82e38de14e, as with other patches backported to -stable, we can now apply the actual upstream commit that matches this. Cc: Fei Yang <fei.yang@intel.com> Cc: Sam Protsenko <semen.protsenko@linaro.org> Cc: Felipe Balbi <balbi@kernel.org> Cc: linux-usb@vger.kernel.org Cc: stable@vger.kernel.org # 4.19.y Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/usb/dwc3/gadget.c | 2 -- 1 file changed, 2 deletions(-)