2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
index 3b2525908dd8..a1a858ad4d18 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -905,8 +905,8 @@ void acpi_cppc_processor_exit(struct acpi_processor *pr)
                         pcc_data[pcc_ss_id]->refcount--;
                         if (!pcc_data[pcc_ss_id]->refcount) {
                                 pcc_mbox_free_channel(pcc_data[pcc_ss_id]->pcc_channel);
-                                pcc_data[pcc_ss_id]->pcc_channel_acquired = 0;
                                 kfree(pcc_data[pcc_ss_id]);
+                                pcc_data[pcc_ss_id] = NULL;
                         }
                 }
         }
diff --git a/drivers/acpi/hmat/hmat.c b/drivers/acpi/hmat/hmat.c
index 8f9a28a870b0..8b0de8a3c647 100644
--- a/drivers/acpi/hmat/hmat.c
+++ b/drivers/acpi/hmat/hmat.c
@@ -403,7 +403,7 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade
                 pr_info("HMAT: Memory Flags:%04x Processor Domain:%d Memory Domain:%d\n",
                         p->flags, p->processor_PD, p->memory_PD);
 
-        if (p->flags & ACPI_HMAT_MEMORY_PD_VALID) {
+        if (p->flags & ACPI_HMAT_MEMORY_PD_VALID && hmat_revision == 1) {
                 target = find_mem_target(p->memory_PD);
                 if (!target) {
                         pr_debug("HMAT: Memory Domain missing from SRAT\n");