diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-06 21:31:00 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-06 21:31:00 +0100 |
| commit | 57e1c5c87db512629dd44ddeb882a5aaf0e4299e (patch) | |
| tree | e71e8a132d4f696beeae1bdab59efeed9517ba66 /drivers/acpi/dock.c | |
| parent | Linux 2.6.20 (diff) | |
| parent | Pull acpica into test branch (diff) | |
| download | linux-57e1c5c87db512629dd44ddeb882a5aaf0e4299e.tar.xz linux-57e1c5c87db512629dd44ddeb882a5aaf0e4299e.zip | |
Pull test into release branch
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 90990a4b6526..688e83a16906 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -615,20 +615,28 @@ static acpi_status find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv) { acpi_status status; - acpi_handle tmp; + acpi_handle tmp, parent; struct dock_station *ds = context; struct dock_dependent_device *dd; status = acpi_bus_get_ejd(handle, &tmp); - if (ACPI_FAILURE(status)) - return AE_OK; + if (ACPI_FAILURE(status)) { + /* try the parent device as well */ + status = acpi_get_parent(handle, &parent); + if (ACPI_FAILURE(status)) + goto fdd_out; + /* see if parent is dependent on dock */ + status = acpi_bus_get_ejd(parent, &tmp); + if (ACPI_FAILURE(status)) + goto fdd_out; + } if (tmp == ds->handle) { dd = alloc_dock_dependent_device(handle); if (dd) add_dock_dependent_device(ds, dd); } - +fdd_out: return AE_OK; } |