diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-26 15:04:49 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-26 15:04:49 +0200 |
| commit | 3660e641ef68dc2503e3c3120814e80359e0e66b (patch) | |
| tree | 58e006c797f83d5d2a5d3b57a772104a9a8c0365 /drivers/acpi/nfit | |
| parent | e8c3c7f97aa79c93713aecba5bdf83273076cf5d (diff) | |
| parent | 470508f63ad2483b1ae82ed67cd504ad408b2a35 (diff) | |
Merge branch 'acpi-bus'
Merge ACPI bus type driver updates for 6.7-rc1:
- Add context argument to acpi_dev_install_notify_handler() (Rafael
Wysocki).
- Clarify ACPI bus concepts in the ACPI device enumeration
documentation (Rafael Wysocki).
* acpi-bus:
ACPI: bus: Add context argument to acpi_dev_install_notify_handler()
ACPI: docs: enumeration: Clarify ACPI bus concepts
Diffstat (limited to 'drivers/acpi/nfit')
| -rw-r--r-- | drivers/acpi/nfit/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 7d88db451cfb..992385537757 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3340,7 +3340,7 @@ static int acpi_nfit_add(struct acpi_device *adev) int rc = 0; rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY, - acpi_nfit_notify); + acpi_nfit_notify, adev); if (rc) return rc; |