Commit 82545394 authored by Shaohua Li's avatar Shaohua Li Committed by Len Brown

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: default avatarShaohua Li <shaohua.li@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 8b59560a
...@@ -575,11 +575,6 @@ static int handle_eject_request(struct dock_station *ds, u32 event) ...@@ -575,11 +575,6 @@ static int handle_eject_request(struct dock_station *ds, u32 event)
*/ */
dock_event(ds, event, UNDOCK_EVENT); dock_event(ds, event, UNDOCK_EVENT);
if (!dock_present(ds)) {
complete_undock(ds);
return -ENODEV;
}
hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST); hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
undock(ds); undock(ds);
eject_dock(ds); eject_dock(ds);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment