Merge tag 'staging-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / drivers / usb / dwc2 / hcd_queue.c

diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
index 7f634fd771c7c8ab6930deadff194eb82a421b2a..b5c7793a2df2b1cdd7623f278d7faa161812de01 100644 (file)
--- a/drivers/usb/dwc2/hcd_queue.c
+++ b/drivers/usb/dwc2/hcd_queue.c
@@ -1709,7 +1709,8 @@ void dwc2_hcd_qh_unlink(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
 
        dwc2_deschedule_periodic(hsotg, qh);
        hsotg->periodic_qh_count--;
-       if (!hsotg->periodic_qh_count) {
+       if (!hsotg->periodic_qh_count &&
+           hsotg->core_params->dma_desc_enable <= 0) {
                intr_mask = dwc2_readl(hsotg->regs + GINTMSK);
                intr_mask &= ~GINTSTS_SOF;
                dwc2_writel(intr_mask, hsotg->regs + GINTMSK);