summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-06-10 18:20:53 -0700
committerDan Williams <dan.j.williams@intel.com>2016-07-07 17:11:09 -0700
commit81ed4e3670853e4cebad88aeffc0ba1d90d4d6ed (patch)
tree588a434ec5decb50ef541932cb3fb84f01dc96ac
parentad9ac5e1957531a826ff6d71dc105f01fa665d2e (diff)
nfit: don't override return value of nfit_mem_init
We were needlessly converting nfit_mem_init() errors to -ENOMEM. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/acpi/nfit.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c
index d79837b9d07e..f8c1a850effc 100644
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
@@ -2422,10 +2422,9 @@ int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, acpi_size sz)
if (rc)
goto out_unlock;
- if (nfit_mem_init(acpi_desc) != 0) {
- rc = -ENOMEM;
+ rc = nfit_mem_init(acpi_desc);
+ if (rc)
goto out_unlock;
- }
acpi_nfit_init_dsms(acpi_desc);