From: Shaohua Li <shaohua.li@intel.com>
Date: Thu, 28 Aug 2008 02:02:41 +0000 (+0800)
Subject: dock: fix eject request process (2.6.27-rc1 regression)
X-Git-Tag: v2.6.28-rc1~26^2~20^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=82545394e0690aaef446cb262aa5dac0f9c7156e;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 25d2161ae9d..78d27cef573 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);