|
@@ -2256,6 +2256,9 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
|
|
|
u32 page_size, temp;
|
|
|
int i;
|
|
|
|
|
|
+ INIT_LIST_HEAD(&xhci->lpm_failed_devs);
|
|
|
+ INIT_LIST_HEAD(&xhci->cancel_cmd_list);
|
|
|
+
|
|
|
page_size = xhci_readl(xhci, &xhci->op_regs->page_size);
|
|
|
xhci_dbg(xhci, "Supported page size register = 0x%x\n", page_size);
|
|
|
for (i = 0; i < 16; i++) {
|
|
@@ -2334,7 +2337,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
|
|
|
xhci->cmd_ring = xhci_ring_alloc(xhci, 1, 1, TYPE_COMMAND, flags);
|
|
|
if (!xhci->cmd_ring)
|
|
|
goto fail;
|
|
|
- INIT_LIST_HEAD(&xhci->cancel_cmd_list);
|
|
|
xhci_dbg(xhci, "Allocated command ring at %p\n", xhci->cmd_ring);
|
|
|
xhci_dbg(xhci, "First segment DMA is 0x%llx\n",
|
|
|
(unsigned long long)xhci->cmd_ring->first_seg->dma);
|
|
@@ -2445,8 +2447,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
|
|
|
if (xhci_setup_port_arrays(xhci, flags))
|
|
|
goto fail;
|
|
|
|
|
|
- INIT_LIST_HEAD(&xhci->lpm_failed_devs);
|
|
|
-
|
|
|
/* Enable USB 3.0 device notifications for function remote wake, which
|
|
|
* is necessary for allowing USB 3.0 devices to do remote wakeup from
|
|
|
* U3 (device suspend).
|