diff options
author | Zhang Rui <rui.zhang@intel.com> | 2010-03-22 03:46:49 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-03-23 00:16:50 -0400 |
commit | 1ee4d61fd9822fb89e63b88a66848477087cd82e (patch) | |
tree | 887189e4904109f3d1b67eb8118bf1a1ac68d6c7 /drivers/acpi | |
parent | 7b1f513aacee53ed2d20cdf82191c7f486136469 (diff) |
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | 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 d9a85f1ddde6..9d67bc660226 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
@@ -1025,13 +1025,10 @@ static int dock_remove(struct dock_station *ds) | |||
1025 | static acpi_status | 1025 | static acpi_status |
1026 | find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) | 1026 | find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) |
1027 | { | 1027 | { |
1028 | acpi_status status = AE_OK; | ||
1029 | |||
1030 | if (is_dock(handle)) | 1028 | if (is_dock(handle)) |
1031 | if (dock_add(handle) >= 0) | 1029 | dock_add(handle); |
1032 | status = AE_CTRL_TERMINATE; | ||
1033 | 1030 | ||
1034 | return status; | 1031 | return AE_OK; |
1035 | } | 1032 | } |
1036 | 1033 | ||
1037 | static acpi_status | 1034 | static acpi_status |