1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index c089668308ad..b1a8a5f4bbb8 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1822,6 +1822,16 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
                 kfree(cur_cd);
         }
 
+        num_ports = HCS_MAX_PORTS(xhci->hcs_params1);
+        for (i = 0; i < num_ports; i++) {
+                struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;
+                for (j = 0; j < XHCI_MAX_INTERVAL; j++) {
+                        struct list_head *ep = &bwt->interval_bw[j].endpoints;
+                        while (!list_empty(ep))
+                                list_del_init(ep->next);
+                }
+        }
+
         for (i = 1; i < MAX_HC_SLOTS; ++i)
                 xhci_free_virt_device(xhci, i);
 
@@ -1857,16 +1867,6 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
         if (!xhci->rh_bw)
                 goto no_bw;
 
-        num_ports = HCS_MAX_PORTS(xhci->hcs_params1);
-        for (i = 0; i < num_ports; i++) {
-                struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;
-                for (j = 0; j < XHCI_MAX_INTERVAL; j++) {
-                        struct list_head *ep = &bwt->interval_bw[j].endpoints;
-                        while (!list_empty(ep))
-                                list_del_init(ep->next);
-                }
-        }
-
         for (i = 0; i < num_ports; i++) {
                 struct xhci_tt_bw_info *tt, *n;
                 list_for_each_entry_safe(tt, n, &xhci->rh_bw[i].tts, tt_list) {