1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 0984a1ee24ed..c92c144d6c58 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -98,11 +98,12 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
 
         struct acpi_pci_driver **pptr = &sub_driver;
         while (*pptr) {
-                if (*pptr != driver)
-                        continue;
-                *pptr = (*pptr)->next;
-                break;
+                if (*pptr == driver)
+                        break;
+                pptr = &(*pptr)->next;
         }
+        BUG_ON(!*pptr);
+        *pptr = (*pptr)->next;
 
         if (!driver->remove)
                 return;