summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm/dimm.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-02-04 08:57:24 +0100
committerIngo Molnar <mingo@kernel.org>2019-02-04 08:57:24 +0100
commit31fe3cbbf26772ad83d2800dcb001f3dae92692e (patch)
treeb56d8a61ff4fb4f44881637aa236d09860e5c63b /drivers/nvdimm/dimm.c
parentfutex: No need to check return value of debugfs_create functions (diff)
parentLinux 5.0-rc5 (diff)
downloadlinux-31fe3cbbf26772ad83d2800dcb001f3dae92692e.tar.xz
linux-31fe3cbbf26772ad83d2800dcb001f3dae92692e.zip
Merge tag 'v5.0-rc5' into locking/core to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/nvdimm/dimm.c')
-rw-r--r--drivers/nvdimm/dimm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/nvdimm/dimm.c b/drivers/nvdimm/dimm.c
index 0cf58cabc9ed..3cf50274fadb 100644
--- a/drivers/nvdimm/dimm.c
+++ b/drivers/nvdimm/dimm.c
@@ -26,6 +26,12 @@ static int nvdimm_probe(struct device *dev)
struct nvdimm_drvdata *ndd;
int rc;
+ rc = nvdimm_security_setup_events(dev);
+ if (rc < 0) {
+ dev_err(dev, "security event setup failed: %d\n", rc);
+ return rc;
+ }
+
rc = nvdimm_check_config_data(dev);
if (rc) {
/* not required for non-aliased nvdimm, ex. NVDIMM-N */