OSDN Git Service

usb: dwc3: core: move dwc3_cache_hwparams before dwc3_alloc_event_buffers
authorKishon Vijay Abraham I <kishon@ti.com>
Fri, 16 Nov 2012 06:37:54 +0000 (12:07 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 16 Nov 2012 12:47:52 +0000 (04:47 -0800)
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>
drivers/usb/dwc3/core.c

index e71a62a..516d400 100644 (file)
@@ -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;
@@ -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");