Merge branches 'acpi-button' and 'acpi-dock' (8f7304bb) · Commits · 戴 / test

drivers/acpi/button.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -73,19 +73,6 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids);

		/* Please keep this list sorted alphabetically by vendor and model */
		static const struct dmi_system_id dmi_lid_quirks[] = {
		{
		/*
		* Acer Switch 10 SW5-012. _LID method messes with home and
		* power button GPIO IRQ settings causing an interrupt storm on
		* both GPIOs. This is unfixable without a DSDT override, so we
		* have to disable the lid-switch functionality altogether :\|
		*/
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"),
		},
		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_DISABLED,
		},
		{
		/* GP-electronic T701, _LID method points to a floating GPIO */
		.matches = {

+2 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,8 @@ static void hot_remove_dock_devices(struct dock_station *ds)
		* between them).
		*/
		list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
		dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false);
		dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST,
		DOCK_CALL_HANDLER);

		list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
		acpi_bus_trim(dd->adev);