Commit 9b311b73 authored by Xiang Chen's avatar Xiang Chen Committed by Rafael J. Wysocki
Browse files

ACPI: NFIT: Install Notify() handler before getting NFIT table 



If there is no NFIT at startup, it will return 0 immediately in function
acpi_nfit_add() and will not install Notify() handler. If hotplugging
a nvdimm device later, it will not be identified as there is no Notify()
handler.

Install the handler before getting NFI table in function acpi_nfit_add()
to avoid above issue.

Fixes: dcca12ab ("ACPI: NFIT: Install Notify() handler directly")
Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f20f29cb

drivers/acpi/nfit/core.c

+11 −11
Original line number Diff line number Diff line
@@ -3339,6 +3339,16 @@ static int acpi_nfit_add(struct acpi_device *adev) 
	acpi_size sz;

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

	if (ACPI_FAILURE(status)) {

		/* The NVDIMM root device allows OS to trigger enumeration of
@@ -3386,17 +3396,7 @@ static int acpi_nfit_add(struct acpi_device *adev) 
	if (rc)

		return rc;



	rc = 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);

	return devm_add_action_or_reset(dev, acpi_nfit_shutdown, acpi_desc);

}



static void acpi_nfit_update_notify(struct device *dev, acpi_handle handle)