From: Linda Knippers <linda.knippers@hpe.com>
Date: Sat, 21 Nov 2015 00:05:48 +0000 (-0500)
Subject: nfit: Fix the check for a successful NFIT merge
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff5a55f89c6690a0b292f1a7e0cd4532961588d5;p=linux-beck.git

nfit: Fix the check for a successful NFIT merge

Missed previously due to a lack of test coverage on a platform that
provided an valid response to _FIT.

Signed-off-by: Linda Knippers <linda.knippers@hpe.com>
Acked-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c
index 4d5ab285de94..f92adb5b0fef 100644
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
@@ -1816,7 +1816,7 @@ static void acpi_nfit_notify(struct acpi_device *adev, u32 event)
 	nfit_saved = acpi_desc->nfit;
 	acpi_desc->nfit = (struct acpi_table_nfit *)buf.pointer;
 	ret = acpi_nfit_init(acpi_desc, buf.length);
-	if (!ret) {
+	if (ret) {
 		/* Merge failed, restore old nfit, and exit */
 		acpi_desc->nfit = nfit_saved;
 		dev_err(dev, "failed to merge updated NFIT\n");