Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afd7301d authored by Holger Macht's avatar Holger Macht Committed by Andi Kleen
Browse files

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



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: default avatarHolger Macht <hmacht@suse.de>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent b635acec

drivers/acpi/dock.c

+8 −3
Original line number Diff line number Diff line
@@ -563,9 +563,6 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device); 
 */

static int handle_eject_request(struct dock_station *ds, u32 event)

{

	if (!dock_present(ds))

		return -ENODEV;



	if (dock_in_progress(ds))

		return -EBUSY;
@@ -573,8 +570,16 @@ static int handle_eject_request(struct dock_station *ds, u32 event) 
	 * here we need to generate the undock

	 * event prior to actually doing the undock

	 * 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);



	if (!dock_present(ds)) {

		complete_undock(ds);

		return -ENODEV;

	}



	hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);

	undock(ds);

	eject_dock(ds);