From patchwork Sat Nov 21 00:05:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linda Knippers X-Patchwork-Id: 57093 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp173385lbb; Fri, 20 Nov 2015 16:06:28 -0800 (PST) X-Received: by 10.98.15.91 with SMTP id x88mr2505985pfi.144.1448064385401; Fri, 20 Nov 2015 16:06:25 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w16si1932771pfa.221.2015.11.20.16.06.25; Fri, 20 Nov 2015 16:06:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760394AbbKUAGY (ORCPT + 6 others); Fri, 20 Nov 2015 19:06:24 -0500 Received: from g1t6223.austin.hp.com ([15.73.96.124]:35433 "EHLO g1t6223.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759822AbbKUAGX (ORCPT ); Fri, 20 Nov 2015 19:06:23 -0500 Received: from g1t6215.austin.hpicorp.net (g1t6215.austin.hpicorp.net [15.67.1.191]) by g1t6223.austin.hp.com (Postfix) with ESMTP id 1DF3C1F2; Sat, 21 Nov 2015 00:06:22 +0000 (UTC) Received: from localhost.localdomain (ospra1.fc.hp.com [16.79.38.118]) by g1t6215.austin.hpicorp.net (Postfix) with ESMTP id D175A66; Sat, 21 Nov 2015 00:06:19 +0000 (UTC) From: Linda Knippers To: dan.j.williams@intel.com, vishal.l.verma@intel.com Cc: linux-nvdimm@lists.01.org, linux-acpi@vger.kernel.org, jmoyer@redhat.com, toshi.kani@hpe.com, elliott@hpe.com, rafael.j.wysocki@intel.com Subject: [PATCH 2/3] nfit: Fix the check for a successful NFIT merge Date: Fri, 20 Nov 2015 19:05:48 -0500 Message-Id: <14dca14555121bafe98db66e897681d17b8dedc6.1448045168.git.linda.knippers@hpe.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Signed-off-by: Linda Knippers --- drivers/acpi/nfit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c index 710092a..c140194d 100644 --- a/drivers/acpi/nfit.c +++ b/drivers/acpi/nfit.c @@ -1834,7 +1834,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");