]>
Commit | Line | Data |
---|---|---|
1 | From: Shaohua Li <shaohua.li@intel.com> | |
2 | Subject: fix eject request process | |
3 | Patch-mainline: submitted 2008-08-28 | |
4 | References: fate#304731,bnc#401740 | |
5 | ||
6 | commit 2a7feab28d3fc060d320eaba192e49dad1079b7e introduces a bug. | |
7 | My thinkpad actually will send an eject_request and we should follow the | |
8 | eject process to finish the eject, otherwise system still thinks the bay | |
9 | is present. | |
10 | ||
11 | Signed-off-by: Shaohua Li <shaohua.li@intel.com> | |
12 | Signed-off-by: Holger Macht <hmacht@suse.de> | |
13 | --- | |
14 | ||
15 | diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c | |
16 | index 25d2161..78d27ce 100644 | |
17 | --- a/drivers/acpi/dock.c | |
18 | +++ b/drivers/acpi/dock.c | |
19 | @@ -575,11 +575,6 @@ static int handle_eject_request(struct dock_station *ds, u32 event) | |
20 | */ | |
21 | dock_event(ds, event, UNDOCK_EVENT); | |
22 | ||
23 | - if (!dock_present(ds)) { | |
24 | - complete_undock(ds); | |
25 | - return -ENODEV; | |
26 | - } | |
27 | - | |
28 | hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST); | |
29 | undock(ds); | |
30 | eject_dock(ds); |