diff options
| author | Paul Zimmerman <Paul.Zimmerman@synopsys.com> | 2012-02-17 14:10:16 -0800 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-03-02 12:12:05 +0200 |
| commit | 9bafa56c7cee5c6fa68de5924220abb220c7e229 (patch) | |
| tree | ddc574916646b889d289e2c36ddf7aab37a54717 /drivers/usb | |
| parent | 27a78d6a283d6782438f72306746afe4bf44c215 (diff) | |
| download | talos-op-linux-9bafa56c7cee5c6fa68de5924220abb220c7e229.tar.gz talos-op-linux-9bafa56c7cee5c6fa68de5924220abb220c7e229.zip | |
usb: dwc3: fix bogus test in dwc3_gadget_start_isoc
Zero is a valid value for a microframe number. So remove the bogus
test for non-zero in dwc3_gadget_start_isoc().
Cc: stable@vger.kernel.org
Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 60b75c302aa4..fac11491850f 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1656,7 +1656,7 @@ static void dwc3_endpoint_transfer_complete(struct dwc3 *dwc, static void dwc3_gadget_start_isoc(struct dwc3 *dwc, struct dwc3_ep *dep, const struct dwc3_event_depevt *event) { - u32 uf; + u32 uf, mask; if (list_empty(&dep->request_list)) { dev_vdbg(dwc->dev, "ISOC ep %s run out for requests.\n", @@ -1664,16 +1664,10 @@ static void dwc3_gadget_start_isoc(struct dwc3 *dwc, return; } - if (event->parameters) { - u32 mask; - - mask = ~(dep->interval - 1); - uf = event->parameters & mask; - /* 4 micro frames in the future */ - uf += dep->interval * 4; - } else { - uf = 0; - } + mask = ~(dep->interval - 1); + uf = event->parameters & mask; + /* 4 micro frames in the future */ + uf += dep->interval * 4; __dwc3_gadget_kick_transfer(dep, uf, 1); } |
