leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: Properly clear flags on false-positives and send uevent on sudden unplug

Browse Source 
Some devices emit a ACPI_NOTIFY_DEVICE_CHECK while physically unplugging
even if the software undock has already been done and dock_present() check
fails. However, the internal flags need to be cleared (complete_undock()).

Also, even notify userspace if the dock station suddently went away
without proper software undocking.

This happens on a Acer TravelMate 3000

Signed-off-by: Holger Macht <hmacht@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
This commit is contained in:
Holger Macht 2008-08-06 17:56:01 +02:00 committed by Andi Kleen
parent b635acec48
commit afd7301ddb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/dock.c
View File

@ -563,9 +563,6 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);
*/ */
static int handle_eject_request(struct dock_station *ds, u32 event) static int handle_eject_request(struct dock_station *ds, u32 event)
{ {
if (!dock_present(ds))
return -ENODEV;
if (dock_in_progress(ds)) if (dock_in_progress(ds))
return -EBUSY; return -EBUSY;
@ -573,8 +570,16 @@ static int handle_eject_request(struct dock_station *ds, u32 event)
* here we need to generate the undock * here we need to generate the undock
* event prior to actually doing the undock * event prior to actually doing the undock
* so that the device struct still exists. * so that the device struct still exists.
* Also, even send the dock event if the
* device is not present anymore
*/ */
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);