diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-06-11 03:20:53 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-08 02:11:09 +0200 |
| commit | 81ed4e3670853e4cebad88aeffc0ba1d90d4d6ed (patch) | |
| tree | 588a434ec5decb50ef541932cb3fb84f01dc96ac /drivers/acpi | |
| parent | nfit: always associate flush hints (diff) | |
| download | linux-81ed4e3670853e4cebad88aeffc0ba1d90d4d6ed.tar.xz linux-81ed4e3670853e4cebad88aeffc0ba1d90d4d6ed.zip | |
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>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/nfit.c | 5 |
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); |