Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+11 -11
+11 -11
drivers/acpi/nfit/core.c
··· 3339 3339 acpi_size sz; 3340 3340 int rc = 0; 3341 3341 3342 + rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY, 3343 + acpi_nfit_notify); 3344 + if (rc) 3345 + return rc; 3346 + 3347 + rc = devm_add_action_or_reset(dev, acpi_nfit_remove_notify_handler, 3348 + adev); 3349 + if (rc) 3350 + return rc; 3351 + 3342 3352 status = acpi_get_table(ACPI_SIG_NFIT, 0, &tbl); 3343 3353 if (ACPI_FAILURE(status)) { 3344 3354 /* The NVDIMM root device allows OS to trigger enumeration of ··· 3396 3386 if (rc) 3397 3387 return rc; 3398 3388 3399 - rc = devm_add_action_or_reset(dev, acpi_nfit_shutdown, acpi_desc); 3400 - if (rc) 3401 - return rc; 3402 - 3403 - rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY, 3404 - acpi_nfit_notify); 3405 - if (rc) 3406 - return rc; 3407 - 3408 - return devm_add_action_or_reset(dev, acpi_nfit_remove_notify_handler, 3409 - adev); 3389 + return devm_add_action_or_reset(dev, acpi_nfit_shutdown, acpi_desc); 3410 3390 } 3411 3391 3412 3392 static void acpi_nfit_update_notify(struct device *dev, acpi_handle handle)