Imported linux-2.6.27.39 suse/xen patches.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.arch / acpi-dock-fix-eject-request-process.patch

diff --git a/src/patches/suse-2.6.27.39/patches.arch/acpi-dock-fix-eject-request-process.patch b/src/patches/suse-2.6.27.39/patches.arch/acpi-dock-fix-eject-request-process.patch
new file mode 100644 (file)
index 0000000..e3158b8
--- /dev/null
+++ b/src/patches/suse-2.6.27.39/patches.arch/acpi-dock-fix-eject-request-process.patch
@@ -0,0 +1,30 @@
+From: Shaohua Li <shaohua.li@intel.com>
+Subject: fix eject request process
+Patch-mainline: submitted 2008-08-28
+References: fate#304731,bnc#401740
+
+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: Holger Macht <hmacht@suse.de>
+---
+
+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);