From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 22 Mar 2010 07:46:49 +0000 (+0800)
Subject: ACPI dock: support multiple ACPI dock devices
X-Git-Tag: v2.6.34-rc4~21^2^5~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ee4d61fd9822fb89e63b88a66848477087cd82e;p=platform%2Fkernel%2Flinux-3.10.git

ACPI dock: support multiple ACPI dock devices

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>
---

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index d9a85f1..9d67bc6 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -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