Revert "usb: dwc2: make the scheduler handle excessive NAKs better"

This reverts commit f5717a75db0d4e590c0c050a6f49c6cc0afcec8a, as it
wasn't ment to be applied to this branch / tree, it should go in through
the USB tree, my fault.

Reported-by: Paul Zimmerman <Paul.Zimmerman@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
index f06249c1b9189f5924f16d14375c904255101941..47b9eb5389b468d4710263bdd9a8d052cbba635c 100644 (file)
--- a/drivers/usb/dwc2/hcd_intr.c
+++ b/drivers/usb/dwc2/hcd_intr.c
@@ -1890,20 +1890,12 @@ static void dwc2_hc_chhltd_intr_dma(struct dwc2_hsotg *hsotg,
                                        "hcint 0x%08x, intsts 0x%08x\n",
                                        chan->hcint,
                                        readl(hsotg->regs + GINTSTS));
-                               goto error;
                        }
                }
        } else {
                dev_info(hsotg->dev,
                         "NYET/NAK/ACK/other in non-error case, 0x%08x\n",
                         chan->hcint);
-error:
-               /* Failthrough: use 3-strikes rule */
-               qtd->error_count++;
-               dwc2_update_urb_state_abn(hsotg, chan, chnum, qtd->urb,
-                                         qtd, DWC2_HC_XFER_XACT_ERR);
-               dwc2_hcd_save_data_toggle(hsotg, chan, chnum, qtd);
-               dwc2_halt_channel(hsotg, chan, qtd, DWC2_HC_XFER_XACT_ERR);
        }
 }