diff options
author | Len Brown <len.brown@intel.com> | 2009-04-05 07:52:07 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-05 07:52:07 +0200 |
commit | 8a3f257c704e02aee9869decd069a806b45be3f1 (patch) | |
tree | adb9d3766c57119381304c3b94334997cc7a74a7 /drivers/acpi/dock.c | |
parent | Merge branch 'x2apic' into release (diff) | |
parent | toshiba-acpi: remove MAINTAINERS entry (diff) | |
download | linux-8a3f257c704e02aee9869decd069a806b45be3f1.tar.xz linux-8a3f257c704e02aee9869decd069a806b45be3f1.zip |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/dock.c')
-rw-r--r-- | drivers/acpi/dock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 35094f230b1e..8f62fa01a9c7 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -1146,9 +1146,10 @@ static int __init dock_init(void) static void __exit dock_exit(void) { struct dock_station *dock_station; + struct dock_station *tmp; unregister_acpi_bus_notifier(&dock_acpi_notifier); - list_for_each_entry(dock_station, &dock_stations, sibiling) + list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibiling) dock_remove(dock_station); } |