From: Paul Zimmerman Date: Mon, 24 Jun 2013 18:34:23 +0000 (-0700) Subject: staging: dwc2: fix thinko in dwc2_hc_set_even_odd_frame() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=81a589555f4951d4b01fb66c0dc2092fa1b6c4ac;p=deliverable%2Flinux.git staging: dwc2: fix thinko in dwc2_hc_set_even_odd_frame() I screwed up the sense of this if() statement while porting our vendor driver to create the dwc2 driver. This caused frame overrun errors on periodic transfers when there were other transfers active in the same (micro)frame. With this fix, the dwc2 driver now works on the Raspberry Pi platform even with the USB Ethernet controller enabled, where before that would cause all USB devices to stop working. Thanks to Ray Jui and Jerry Lin at Broadcom for tracking this down. Reported-by: Ray Jui Signed-off-by: Paul Zimmerman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dwc2/core.c b/drivers/staging/dwc2/core.c index ac8ed15064dc..e3a0e770301d 100644 --- a/drivers/staging/dwc2/core.c +++ b/drivers/staging/dwc2/core.c @@ -1148,7 +1148,7 @@ static void dwc2_hc_set_even_odd_frame(struct dwc2_hsotg *hsotg, if (chan->ep_type == USB_ENDPOINT_XFER_INT || chan->ep_type == USB_ENDPOINT_XFER_ISOC) { /* 1 if _next_ frame is odd, 0 if it's even */ - if (dwc2_hcd_get_frame_number(hsotg) & 0x1) + if (!(dwc2_hcd_get_frame_number(hsotg) & 0x1)) *hcchar |= HCCHAR_ODDFRM; } }