diff options
author | Len Brown <len.brown@intel.com> | 2006-12-20 02:52:50 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-12-20 02:52:50 -0500 |
commit | 3be11c8f4f2fa194834c2e83540f34da442b8977 (patch) | |
tree | 35386fe97c1dd62a261c297512b8e5137b56c35d /drivers/acpi/pci_root.c | |
parent | 706b75ddbe36d20d071424f9867385c319b67f8d (diff) | |
parent | 6796a1204cfeac6dab1c2dd682d1138454eca661 (diff) |
Pull bugfix into test branch
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r-- | drivers/acpi/pci_root.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 03e03741c140..b9c52cdbf658 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) | |||
98 | 98 | ||
99 | struct acpi_pci_driver **pptr = &sub_driver; | 99 | struct acpi_pci_driver **pptr = &sub_driver; |
100 | while (*pptr) { | 100 | while (*pptr) { |
101 | if (*pptr != driver) | 101 | if (*pptr == driver) |
102 | continue; | 102 | break; |
103 | *pptr = (*pptr)->next; | 103 | pptr = &(*pptr)->next; |
104 | break; | ||
105 | } | 104 | } |
105 | BUG_ON(!*pptr); | ||
106 | *pptr = (*pptr)->next; | ||
106 | 107 | ||
107 | if (!driver->remove) | 108 | if (!driver->remove) |
108 | return; | 109 | return; |