1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 999adb5499c7..551dad712ffe 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -152,8 +152,9 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device)
         unsigned long long current_status;
 
         /* Get device present/absent information from the _STA */
-        if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle, "_STA",
-                                               NULL, &current_status)))
+        if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle,
+                                               METHOD_NAME__STA, NULL,
+                                               &current_status)))
                 return -ENODEV;
         /*
          * Check for device status. Device should be
@@ -281,7 +282,7 @@ static void acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
                 if (!info->enabled)
                         continue;
 
-                if (nid < 0)
+                if (nid == NUMA_NO_NODE)
                         nid = memory_add_physaddr_to_nid(info->start_addr);
 
                 acpi_unbind_memory_blocks(info, handle);