diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2008-08-28 10:02:41 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-09-23 22:57:19 -0400 |
| commit | 82545394e0690aaef446cb262aa5dac0f9c7156e (patch) | |
| tree | 65a1d7a47853435dbf8f3b94a4d443c4fb4026da /drivers/acpi | |
| parent | 8b59560a3baf2e7c24e0fb92ea5d09eca92805db (diff) | |
| download | kernel_goldelico_gta04-82545394e0690aaef446cb262aa5dac0f9c7156e.zip kernel_goldelico_gta04-82545394e0690aaef446cb262aa5dac0f9c7156e.tar.gz kernel_goldelico_gta04-82545394e0690aaef446cb262aa5dac0f9c7156e.tar.bz2 | |
dock: fix eject request process (2.6.27-rc1 regression)
commit 2a7feab28d3fc060d320eaba192e49dad1079b7e introduces a bug.
My thinkpad actually will send an eject_request and we should follow the
eject process to finish the eject, otherwise system still thinks the bay
is present.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/dock.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 25d2161..78d27ce 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -575,11 +575,6 @@ static int handle_eject_request(struct dock_station *ds, u32 event) */ dock_event(ds, event, UNDOCK_EVENT); - if (!dock_present(ds)) { - complete_undock(ds); - return -ENODEV; - } - hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST); undock(ds); eject_dock(ds); |