summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-06-05 16:58:09 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-06-05 16:58:09 +0200
commit1bfc0835d40c8b4f19f8c1db8c42edddb265df5f (patch)
tree6c3dbb9f4ffde9a83b16ec9fad8a7df39ae04b11 /drivers
parentac62f52138f752d6c74adc6321e4996d84caf5bb (diff)
parentc4bd7f1d78340e63de4d073fd3dbe5391e2996e5 (diff)
parent7ff6c798eca05e4a9dcb80163cb454d7787a4bc3 (diff)
parentedcde848c01eb071a91d479a6b3101d9cf48e905 (diff)
Merge branches 'acpi-ec', 'acpi-apei' and 'pnp'
Merge ACPI EC driver fixes, an ACPI APEI fix and PNP fixes for 6.10-rc3: - Fix error handling during EC operation region accesses in the ACPI EC driver (Armin Wolf). - Fix a memory leak in the APEI error injection driver introduced during its converion to a platform driver (Dan Williams). - Fix build failures related to the dev_is_pnp() macro by redefining it as a proper function and exporting it to modules as appropriate and unexport pnp_bus_type which need not be exported any more (Andy Shevchenko). * acpi-ec: ACPI: EC: Avoid returning AE_OK on errors in address space handler ACPI: EC: Abort address space access upon error * acpi-apei: ACPI: APEI: EINJ: Fix einj_dev release leak * pnp: PNP: Hide pnp_bus_type from the non-PNP code PNP: Make dev_is_pnp() to be a function and export it for modules