nfit: don't override return value of nfit_mem_init
authorDan Williams <dan.j.williams@intel.com>
Sat, 11 Jun 2016 01:20:53 +0000 (18:20 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 8 Jul 2016 00:11:09 +0000 (17:11 -0700)
We were needlessly converting nfit_mem_init() errors to -ENOMEM.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/acpi/nfit.c

index d79837b..f8c1a85 100644 (file)
@@ -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);