1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/usb/host/xhci-ext-caps.h b/drivers/usb/host/xhci-ext-caps.h
index ecc131c3fe33..78c4edac1db1 100644
--- a/drivers/usb/host/xhci-ext-caps.h
+++ b/drivers/usb/host/xhci-ext-caps.h
@@ -101,12 +101,15 @@ static inline int xhci_find_next_cap_offset(void __iomem *base, int ext_offset)
 
         next = readl(base + ext_offset);
 
-        if (ext_offset == XHCI_HCC_PARAMS_OFFSET)
+        if (ext_offset == XHCI_HCC_PARAMS_OFFSET) {
                 /* Find the first extended capability */
                 next = XHCI_HCC_EXT_CAPS(next);
-        else
+                ext_offset = 0;
+        } else {
                 /* Find the next extended capability */
                 next = XHCI_EXT_CAPS_NEXT(next);
+        }
+
         if (!next)
                 return 0;
         /*