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

This reverts commit f5717a75db, 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>
This commit is contained in:
Greg Kroah-Hartman 2014-09-14 12:53:51 -07:00
parent 3f2882d369
commit ea521dbc48

View File

@ -1890,20 +1890,12 @@ static void dwc2_hc_chhltd_intr_dma(struct dwc2_hsotg *hsotg,
"hcint 0x%08x, intsts 0x%08x\n", "hcint 0x%08x, intsts 0x%08x\n",
chan->hcint, chan->hcint,
readl(hsotg->regs + GINTSTS)); readl(hsotg->regs + GINTSTS));
goto error;
} }
} }
} else { } else {
dev_info(hsotg->dev, dev_info(hsotg->dev,
"NYET/NAK/ACK/other in non-error case, 0x%08x\n", "NYET/NAK/ACK/other in non-error case, 0x%08x\n",
chan->hcint); 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);
} }
} }