Gitweb: http://git.kernel.org/linus/1ee4d61fd9822fb89e63b88a66848477087cd82e
Commit: 1ee4d61fd9822fb89e63b88a66848477087cd82e
Parent: 7b1f513aacee53ed2d20cdf82191c7f486136469
Author: Zhang Rui <rui.zhang@intel.com>
AuthorDate: Mon Mar 22 15:46:49 2010 +0800
Committer: Len Brown <len.brown@intel.com>
CommitDate: Tue Mar 23 00:16:50 2010 -0400
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>
---
drivers/acpi/dock.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
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
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
