| Message ID | 154757678148.35482.4492154450935271566.stgit@djiang5-desk3.ch.intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | faa8bd6e12e6aeea289d8e6ba74777b72a69434c |
| Headers | show |
| Series | libnvdimm/security: fix nvdimm_security_state() state request selection | expand |
On Tue, Jan 15, 2019 at 10:26 AM Dave Jiang <dave.jiang@intel.com> wrote: > > 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 ("acpi/nfit, libnvdimm/security: add Intel DSM 1.8 master passphrase support") > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > --- > drivers/nvdimm/nd-core.h | 4 ++-- > 1 file 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 { > }; > > static inline enum nvdimm_security_state nvdimm_security_state( > - struct nvdimm *nvdimm, bool master) > + struct nvdimm *nvdimm, enum nvdimm_passphrase_type ptype) > { > if (!nvdimm->sec.ops) > return -ENXIO; > > - return nvdimm->sec.ops->state(nvdimm, master); > + return nvdimm->sec.ops->state(nvdimm, ptype); > } Ok, applied.
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 { }; static inline enum nvdimm_security_state nvdimm_security_state( - struct nvdimm *nvdimm, bool master) + struct nvdimm *nvdimm, enum nvdimm_passphrase_type ptype) { if (!nvdimm->sec.ops) return -ENXIO; - return nvdimm->sec.ops->state(nvdimm, master); + return nvdimm->sec.ops->state(nvdimm, ptype); } int nvdimm_security_freeze(struct nvdimm *nvdimm); #if IS_ENABLED(CONFIG_NVDIMM_KEYS)
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 ("acpi/nfit, libnvdimm/security: add Intel DSM 1.8 master passphrase support") Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- drivers/nvdimm/nd-core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)