]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ACPI: fix single linked list manipulation
authorAkinobu Mita <akinobu.mita@gmail.com>
Tue, 19 Dec 2006 20:56:09 +0000 (12:56 -0800)
committerLen Brown <len.brown@intel.com>
Wed, 20 Dec 2006 05:30:48 +0000 (00:30 -0500)
Fix single linked list manipulation for sub_driver.  If the remving entry
is not on the head of the sub_driver list, it goes into infinate loop.

Though that infinite loop doesn't happen.  Because the only user of
acpi_pci_register_dirver() is acpiphp.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/pci_root.c

index 0984a1ee24edceecbd9593b8da72b139f1fc4201..c92c144d6c58d54bd0bc91567939aa6fd03cc4d0 100644 (file)
@@ -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;