1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c
index 9e45b207ff01..89b85970912d 100644
--- a/drivers/nvdimm/security.c
+++ b/drivers/nvdimm/security.c
@@ -177,6 +177,10 @@ static int __nvdimm_security_unlock(struct nvdimm *nvdimm)
                         || !nvdimm->sec.flags)
                 return -EIO;
 
+        /* No need to go further if security is disabled */
+        if (test_bit(NVDIMM_SECURITY_DISABLED, &nvdimm->sec.flags))
+                return 0;
+
         if (test_bit(NDD_SECURITY_OVERWRITE, &nvdimm->flags)) {
                 dev_dbg(dev, "Security operation in progress.\n");
                 return -EBUSY;