diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-11 16:56:38 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-11 16:56:38 +0200 |
| commit | d2950158d0d7bc376503393ca5f73f6f8d27c56b (patch) | |
| tree | 7daa04400d833bd722258a49d56a39acfb392520 /drivers/acpi/nfit.c | |
| parent | ea7c28518943b26a85d73cd76acd03b71962cb18 (diff) | |
| parent | e9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f (diff) | |
| download | linux-d2950158d0d7bc376503393ca5f73f6f8d27c56b.tar.bz2 | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/nfit.c')
| -rw-r--r-- | drivers/acpi/nfit.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c index d0f35e63640b..63cc9dbe4f3b 100644 --- a/drivers/acpi/nfit.c +++ b/drivers/acpi/nfit.c @@ -287,8 +287,11 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, offset); rc = -ENXIO; } - } else + } else { rc = 0; + if (cmd_rc) + *cmd_rc = xlat_status(buf, cmd); + } out: ACPI_FREE(out_obj); |