mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-18 13:04:18 +00:00
ACPI fixes for 5.10-rc2
- 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). -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAl+cO3wSHHJqd0Byand5 c29ja2kubmV0AAoJEILEb/54YlRx2jYP/2wV5oLJ8DR5fgz+jphvpAxkXO0M9NuD g6CHNLXM7Xzw2Tp+MBooyCmTh6ya11jEwyovy1724SIBrDQCmHkm7fY3Ias+Tjcv dSYYwO0yPacU9AQd0CQs+LnH4/rwmf0BYq7+fZS+epHy5cYcZeXY2N0BOrT9xllF 3jFDaMl3Qv2T07TMdNciAPORpY2I+xJz5h+tYCnt1+GPDLlHShgwcz6bwl7mXSOB h77sZX0Mu8pfAUbR9JI1qt8TbaiKMfcsdq9+yxq7xbPx+znH722Bz8e5Dvfw9Z1C BfWN8TPjHiCfKF0z/50iw7RvPQz4scxKv9wnxOIvVmnUSSBkhQeYcj0fqBCf/XvN uwuRCBBrKxknwOHovU+psQRuGN3XhD3ZAdPtTvGMoggCcWMNPelh5ajdBlFB5vGr 9NJKREFHe6nSOCpsrEgALV6c8WDt23qY4wMYoMDWqsqoFjpSLHqCavhfYbC42Bj8 2t3lO7w3RXWQtMixIyene1q6+Hcs7O1touaEa7XExsjxfHesE4rdIVraUKFHu8MZ Jdketfd5A0g/wBtmiigknrazakS3pgOynfAoYEjEhcVGNZPH27P/u5hGemdBxS7M c3nTeclQtkoUCnP+vFNzdhyMFzTfEsicuN7ZN4VotNwJHsNLsBdoFPljkhasibRg cE9GLlDI6utm =loGI -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
ee176906dc
3 changed files with 3 additions and 15 deletions
|
@ -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 = {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue