Commit 611da07b authored by Linus Torvalds's avatar Linus Torvalds

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

Pull ACPI fix from Rafael Wysocki:
 "Unbreak the ACPI NFIT driver after a recent change that inadvertently
  altered its behavior (Xiang Chen)"

* tag 'acpi-6.6-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: NFIT: Install Notify() handler before getting NFIT table
parents 4f828701 9b311b73
...@@ -3339,6 +3339,16 @@ static int acpi_nfit_add(struct acpi_device *adev) ...@@ -3339,6 +3339,16 @@ static int acpi_nfit_add(struct acpi_device *adev)
acpi_size sz; acpi_size sz;
int rc = 0; int rc = 0;
rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY,
acpi_nfit_notify);
if (rc)
return rc;
rc = devm_add_action_or_reset(dev, acpi_nfit_remove_notify_handler,
adev);
if (rc)
return rc;
status = acpi_get_table(ACPI_SIG_NFIT, 0, &tbl); status = acpi_get_table(ACPI_SIG_NFIT, 0, &tbl);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
/* The NVDIMM root device allows OS to trigger enumeration of /* The NVDIMM root device allows OS to trigger enumeration of
...@@ -3386,17 +3396,7 @@ static int acpi_nfit_add(struct acpi_device *adev) ...@@ -3386,17 +3396,7 @@ static int acpi_nfit_add(struct acpi_device *adev)
if (rc) if (rc)
return rc; return rc;
rc = devm_add_action_or_reset(dev, acpi_nfit_shutdown, acpi_desc); return devm_add_action_or_reset(dev, acpi_nfit_shutdown, acpi_desc);
if (rc)
return rc;
rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY,
acpi_nfit_notify);
if (rc)
return rc;
return devm_add_action_or_reset(dev, acpi_nfit_remove_notify_handler,
adev);
} }
static void acpi_nfit_update_notify(struct device *dev, acpi_handle handle) static void acpi_nfit_update_notify(struct device *dev, acpi_handle handle)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment