]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ACPI dock: support multiple ACPI dock devices
authorZhang Rui <rui.zhang@intel.com>
Mon, 22 Mar 2010 07:46:49 +0000 (15:46 +0800)
committerLen Brown <len.brown@intel.com>
Tue, 23 Mar 2010 04:16:50 +0000 (00:16 -0400)
There may be multiple ACPI dock devices exist in ACPI namespace
and we should probe all of them.
http://bugzilla.kernel.org/show_bug.cgi?id=15521

CC: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/dock.c

index d9a85f1ddde6ca62ac1d529f4023df10b140714d..9d67bc660226f21e8d78c120c137dbf20a9eee9e 100644 (file)
@@ -1025,13 +1025,10 @@ static int dock_remove(struct dock_station *ds)
 static acpi_status
 find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
-       acpi_status status = AE_OK;
-
        if (is_dock(handle))
-               if (dock_add(handle) >= 0)
-                       status = AE_CTRL_TERMINATE;
+               dock_add(handle);
 
-       return status;
+       return AE_OK;
 }
 
 static acpi_status