Commit ee176906 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These fix three assorted minor issues.

  Specifics:

   - Eliminate compiler warning emitted when building the ACPI dock
     driver (Arnd Bergmann).

   - Drop lid_init_state quirk for Acer SW5-012 that is not needed any
     more after recent changes (Hans de Goede).

   - Fix "missing minus" typo in the NFIT parsing code (Zhang Qilong)"

* tag 'acpi-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: button: Drop no longer necessary Acer SW5-012 lid_init_state quirk
  ACPI: NFIT: Fix comparison to '-ENXIO'
  ACPI: dock: fix enum-conversion warning
parents 8843f405 8f7304bb

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 = {

drivers/acpi/dock.c

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

drivers/acpi/nfit/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ static ssize_t format1_show(struct device *dev, 
					le16_to_cpu(nfit_dcr->dcr->code));

			break;

		}

		if (rc != ENXIO)

		if (rc != -ENXIO)

			break;

	}

	mutex_unlock(&acpi_desc->init_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE