diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2010-03-22 08:46:49 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-03-23 05:16:50 +0100 |
| commit | 1ee4d61fd9822fb89e63b88a66848477087cd82e (patch) | |
| tree | 887189e4904109f3d1b67eb8118bf1a1ac68d6c7 /drivers/acpi/dock.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst... (diff) | |
| download | linux-1ee4d61fd9822fb89e63b88a66848477087cd82e.tar.xz linux-1ee4d61fd9822fb89e63b88a66848477087cd82e.zip | |
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/dock.c')
| -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) 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 |