diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2008-08-28 10:07:14 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-09-23 23:48:52 -0400 |
| commit | 61b836958371c717d1e6d4fea1d2c512969ad20b (patch) | |
| tree | ef932bf865c7b30b87cdb34b56e4401d11e78c74 /drivers/acpi/dock.c | |
| parent | 4be9309d15e88e4a1e4a78deb52eb88c7da38c99 (diff) | |
| download | op-kernel-dev-61b836958371c717d1e6d4fea1d2c512969ad20b.zip op-kernel-dev-61b836958371c717d1e6d4fea1d2c512969ad20b.tar.gz | |
dock: fix for ATA bay in a dock station
an ATA bay can be in a dock and itself can be ejected separately.
This patch handles such eject bay. Found by Holger.
Signed-off-by: Shaohua Li <shaohua.li@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 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index ac7dfef..c877cc5 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -609,6 +609,7 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops, { struct dock_dependent_device *dd; struct dock_station *dock_station; + int ret = -EINVAL; if (!dock_station_count) return -ENODEV; @@ -618,16 +619,21 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops, * this would include the dock station itself */ list_for_each_entry(dock_station, &dock_stations, sibiling) { + /* + * An ATA bay can be in a dock and itself can be ejected + * seperately, so there are two 'dock stations' which need the + * ops + */ dd = find_dock_dependent_device(dock_station, handle); if (dd) { dd->ops = ops; dd->context = context; dock_add_hotplug_device(dock_station, dd); - return 0; + ret = 0; } } - return -EINVAL; + return ret; } EXPORT_SYMBOL_GPL(register_hotplug_dock_device); @@ -1078,8 +1084,8 @@ find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) static acpi_status find_bay(acpi_handle handle, u32 lvl, void *context, void **rv) { - /* If bay is in a dock, it's already handled */ - if (is_ejectable_bay(handle) && !is_dock_device(handle)) + /* If bay is a dock, it's already handled */ + if (is_ejectable_bay(handle) && !is_dock(handle)) dock_add(handle); return AE_OK; } |
