1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index d15814e1727f..471402cee1f1 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -408,6 +408,7 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
         const guid_t *guid;
         int rc, i;
 
+        *cmd_rc = -EINVAL;
         func = cmd;
         if (cmd == ND_CMD_CALL) {
                 call_pkg = buf;
@@ -518,6 +519,7 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
                  * If we return an error (like elsewhere) then caller wouldn't
                  * be able to rely upon data returned to make calculation.
                  */
+                *cmd_rc = 0;
                 return 0;
         }