2 files changed, 11 insertions, 16 deletions

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index f8c638f3c946..14d9f5bea015 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -2928,9 +2928,9 @@ static int acpi_nfit_query_poison(struct acpi_nfit_desc *acpi_desc)
                 return rc;
 
         if (ars_status_process_records(acpi_desc))
-                return -ENOMEM;
+                dev_err(acpi_desc->dev, "Failed to process ARS records\n");
 
-        return 0;
+        return rc;
 }
 
 static int ars_register(struct acpi_nfit_desc *acpi_desc,
@@ -3341,8 +3341,6 @@ static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,
                 struct nvdimm *nvdimm, unsigned int cmd)
 {
         struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);
-        struct nfit_spa *nfit_spa;
-        int rc = 0;
 
         if (nvdimm)
                 return 0;
@@ -3355,17 +3353,10 @@ static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,
          * just needs guarantees that any ARS it initiates are not
          * interrupted by any intervening start requests from userspace.
          */
-        mutex_lock(&acpi_desc->init_mutex);
-        list_for_each_entry(nfit_spa, &acpi_desc->spas, list)
-                if (acpi_desc->scrub_spa
-                                || test_bit(ARS_REQ_SHORT, &nfit_spa->ars_state)
-                                || test_bit(ARS_REQ_LONG, &nfit_spa->ars_state)) {
-                        rc = -EBUSY;
-                        break;
-                }
-        mutex_unlock(&acpi_desc->init_mutex);
+        if (work_busy(&acpi_desc->dwork.work))
+                return -EBUSY;
 
-        return rc;
+        return 0;
 }
 
 int acpi_nfit_ars_rescan(struct acpi_nfit_desc *acpi_desc,
diff --git a/drivers/acpi/nfit/mce.c b/drivers/acpi/nfit/mce.c
index e9626bf6ca29..d6c1b10f6c25 100644
--- a/drivers/acpi/nfit/mce.c
+++ b/drivers/acpi/nfit/mce.c
@@ -25,8 +25,12 @@ static int nfit_handle_mce(struct notifier_block *nb, unsigned long val,
         struct acpi_nfit_desc *acpi_desc;
         struct nfit_spa *nfit_spa;
 
-        /* We only care about memory errors */
-        if (!mce_is_memory_error(mce))
+        /* We only care about uncorrectable memory errors */
+        if (!mce_is_memory_error(mce) || mce_is_correctable(mce))
+                return NOTIFY_DONE;
+
+        /* Verify the address reported in the MCE is valid. */
+        if (!mce_usable_address(mce))
                 return NOTIFY_DONE;
 
         /*