Skip to content

Commit

Permalink
usb: dwc3: core: move dwc3_cache_hwparams before dwc3_alloc_event_buf…
Browse files Browse the repository at this point in the history
…fers

commit 392142 moved event buffer allocation out of dwc3_core_init() but
event buffer allocation uses the cached copy of hwparams to determine
the number of event buffers and the caching is done in dwc3_core_init.
So moved dwc3_cache_hwparams function before dwc3_alloc_event_buffers so
that dwc3_alloc_event_buffers sees the correct number of event buffers.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Kishon Vijay Abraham I authored and Greg Kroah-Hartman committed Nov 16, 2012
1 parent ac96511 commit 4fd2448
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/dwc3/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,6 @@ static int __devinit dwc3_core_init(struct dwc3 *dwc)

dwc3_core_soft_reset(dwc);

dwc3_cache_hwparams(dwc);

reg = dwc3_readl(dwc->regs, DWC3_GCTL);
reg &= ~DWC3_GCTL_SCALEDOWN_MASK;
reg &= ~DWC3_GCTL_DISSCRAMBLE;
Expand Down Expand Up @@ -460,6 +458,8 @@ static int __devinit dwc3_probe(struct platform_device *pdev)
pm_runtime_get_sync(dev);
pm_runtime_forbid(dev);

dwc3_cache_hwparams(dwc);

ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
if (ret) {
dev_err(dwc->dev, "failed to allocate event buffers\n");
Expand Down

0 comments on commit 4fd2448

Please sign in to comment.