| Message ID | 20210308073103.33763-1-pawell@gli-login.cadence.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d0dcd90b7f472691de122515eb0d1765808b6d91 |
| Headers | show |
| Series | [v2] usb: cdnsp: Fixes incorrect value in ISOC TRB | expand |
On Mon, Mar 08, 2021 at 08:31:03AM +0100, Pawel Laszczak wrote: > From: Pawel Laszczak <pawell@cadence.com> > > Fixes issue with priority of operator. Operator "|" priority is > higher then "? :". > To improve the readability the operator "? :" has been replaced with > "if ()" statement. > > Fixes: 3d82904559f4 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver") > Signed-off-by: Pawel Laszczak <pawell@cadence.com> > > --- > Changelog: > v2: > - changed the commit log > - added separate "if" statement to improve readability > > drivers/usb/cdns3/cdnsp-ring.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/cdns3/cdnsp-ring.c b/drivers/usb/cdns3/cdnsp-ring.c > index e15e13ba27dc..b23f09a68427 100644 > --- a/drivers/usb/cdns3/cdnsp-ring.c > +++ b/drivers/usb/cdns3/cdnsp-ring.c > @@ -2198,7 +2198,10 @@ static int cdnsp_queue_isoc_tx(struct cdnsp_device *pdev, > * inverted in the first TDs isoc TRB. > */ > field = TRB_TYPE(TRB_ISOC) | TRB_TLBPC(last_burst_pkt) | > - start_cycle ? 0 : 1 | TRB_SIA | TRB_TBC(burst_count); > + TRB_SIA | TRB_TBC(burst_count); > + > + if (!start_cycle) > + field |= TRB_CYCLE; Thank you for the change: Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/cdns3/cdnsp-ring.c b/drivers/usb/cdns3/cdnsp-ring.c index e15e13ba27dc..b23f09a68427 100644 --- a/drivers/usb/cdns3/cdnsp-ring.c +++ b/drivers/usb/cdns3/cdnsp-ring.c @@ -2198,7 +2198,10 @@ static int cdnsp_queue_isoc_tx(struct cdnsp_device *pdev, * inverted in the first TDs isoc TRB. */ field = TRB_TYPE(TRB_ISOC) | TRB_TLBPC(last_burst_pkt) | - start_cycle ? 0 : 1 | TRB_SIA | TRB_TBC(burst_count); + TRB_SIA | TRB_TBC(burst_count); + + if (!start_cycle) + field |= TRB_CYCLE; /* Fill the rest of the TRB fields, and remaining normal TRBs. */ for (i = 0; i < trbs_per_td; i++) {