aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/dwc3/gadget.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-18 22:41:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-18 22:41:42 +0200
commitdc14036fb3240a1bc2677cf8de33fbcb3af77826 (patch)
tree177cd42a0fdc3e37504075d3b389bf7e894ffb5e /drivers/usb/dwc3/gadget.c
parentplatform/chrome: cros_ec_typec: Get retimer handle (diff)
parentLinux 5.19-rc7 (diff)
downloadlinux-dev-dc14036fb3240a1bc2677cf8de33fbcb3af77826.tar.xz
linux-dev-dc14036fb3240a1bc2677cf8de33fbcb3af77826.zip
Merge 5.19-rc7 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/dwc3/gadget.c')
-rw-r--r--drivers/usb/dwc3/gadget.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 4366c45c28cf..aeeec751c53c 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -4238,7 +4238,6 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3_event_buffer *evt)
}
evt->count = 0;
- evt->flags &= ~DWC3_EVENT_PENDING;
ret = IRQ_HANDLED;
/* Unmask interrupt */
@@ -4250,6 +4249,9 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3_event_buffer *evt)
dwc3_writel(dwc->regs, DWC3_DEV_IMOD(0), dwc->imod_interval);
}
+ /* Keep the clearing of DWC3_EVENT_PENDING at the end */
+ evt->flags &= ~DWC3_EVENT_PENDING;
+
return ret;
}