diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-18 07:55:55 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-18 07:55:55 +0200 |
commit | 48a789079a146ecd916e29cc5e47410d9cb05fbe (patch) | |
tree | 04f890f10e9cbdd97b4bf72647656ec94cb8d51f /drivers/usb/cdns3 | |
parent | 2478be82de44bee4346eb1f48d4cfa28cd99d2d0 (diff) | |
parent | b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce (diff) | |
download | linux-48a789079a146ecd916e29cc5e47410d9cb05fbe.tar.bz2 |
Merge 5.7-rc6 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/cdns3')
-rw-r--r-- | drivers/usb/cdns3/gadget.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c index 8af1983cc10d..559e5c01c2b0 100644 --- a/drivers/usb/cdns3/gadget.c +++ b/drivers/usb/cdns3/gadget.c @@ -2548,7 +2548,7 @@ found: link_trb = priv_req->trb; /* Update ring only if removed request is on pending_req_list list */ - if (req_on_hw_ring) { + if (req_on_hw_ring && link_trb) { link_trb->buffer = TRB_BUFFER(priv_ep->trb_pool_dma + ((priv_req->end_trb + 1) * TRB_SIZE)); link_trb->control = (link_trb->control & TRB_CYCLE) | |