[PATCH v2 02/17] nfit: don't override return value of nfit_mem_init

[Dan Williams]

We were needlessly converting nfit_mem_init() errors to -ENOMEM.

Signed-off-by: Dan Williams <dan.j.willi...@intel.com>
---
 drivers/acpi/nfit.c |    5 ++---
 1 file 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);