Merge drm/drm-next into drm-misc-next

[linux.git] / drivers / nvdimm / security.c

diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c
index 9e45b207ff0169f0c820a91c0d80eed141500004..89b85970912dbe076ae37cbc2ce56bce570f0457 100644 (file)
--- 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;