diff options
author | Dave Jiang <dave.jiang@intel.com> | 2019-01-15 13:26:21 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2019-01-15 16:54:33 -0500 |
commit | faa8bd6e12e6aeea289d8e6ba74777b72a69434c (patch) | |
tree | 01af682e69c625708d3a42a38fe129a681cf9db0 | |
parent | b4fe30e45a660efa8f122070fc7173715d0e1d00 (diff) |
libnvdimm/security: Fix nvdimm_security_state() state request selection
The input parameter should be enum nvdimm_passphrase_type instead of bool
for selection of master/user for selection of extended master passphrase
state or the regular user passphrase state.
Fixes: 89fa9d8ea7bdf ("...add Intel DSM 1.8 master passphrase support")
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r-- | drivers/nvdimm/nd-core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h index 2b2cf4e554d3..e5ffd5733540 100644 --- a/drivers/nvdimm/nd-core.h +++ b/drivers/nvdimm/nd-core.h | |||
@@ -54,12 +54,12 @@ struct nvdimm { | |||
54 | }; | 54 | }; |
55 | 55 | ||
56 | static inline enum nvdimm_security_state nvdimm_security_state( | 56 | static inline enum nvdimm_security_state nvdimm_security_state( |
57 | struct nvdimm *nvdimm, bool master) | 57 | struct nvdimm *nvdimm, enum nvdimm_passphrase_type ptype) |
58 | { | 58 | { |
59 | if (!nvdimm->sec.ops) | 59 | if (!nvdimm->sec.ops) |
60 | return -ENXIO; | 60 | return -ENXIO; |
61 | 61 | ||
62 | return nvdimm->sec.ops->state(nvdimm, master); | 62 | return nvdimm->sec.ops->state(nvdimm, ptype); |
63 | } | 63 | } |
64 | int nvdimm_security_freeze(struct nvdimm *nvdimm); | 64 | int nvdimm_security_freeze(struct nvdimm *nvdimm); |
65 | #if IS_ENABLED(CONFIG_NVDIMM_KEYS) | 65 | #if IS_ENABLED(CONFIG_NVDIMM_KEYS) |