diff options
| author | Greg Kroah-Hartman | 2015-09-27 21:44:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-09-27 21:44:02 +0200 |
| commit | c566f365434e732986d7904e29c8122dfcb1e333 (patch) | |
| tree | a2189979d71d844f62d0ef75836e9f6c72ab60ff /drivers/misc | |
| parent | ti-st: use worker instead of calling st_int_write in wake up (diff) | |
| parent | Linux 4.3-rc3 (diff) | |
| download | kernel-qcow2-linux-c566f365434e732986d7904e29c8122dfcb1e333.tar.gz kernel-qcow2-linux-c566f365434e732986d7904e29c8122dfcb1e333.tar.xz kernel-qcow2-linux-c566f365434e732986d7904e29c8122dfcb1e333.zip | |
Merge 4.3-rc3 into char-misc-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/cxl/sysfs.c | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/debugfs.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c index 25868c2ec03e..02006f7109a8 100644 --- a/drivers/misc/cxl/sysfs.c +++ b/drivers/misc/cxl/sysfs.c @@ -592,6 +592,8 @@ int cxl_sysfs_afu_add(struct cxl_afu *afu) /* conditionally create the add the binary file for error info buffer */ if (afu->eb_len) { + sysfs_attr_init(&afu->attr_eb.attr); + afu->attr_eb.attr.name = "afu_err_buff"; afu->attr_eb.attr.mode = S_IRUGO; afu->attr_eb.size = afu->eb_len; diff --git a/drivers/misc/mei/debugfs.c b/drivers/misc/mei/debugfs.c index 4b469cf9e60f..8504dbeacd3b 100644 --- a/drivers/misc/mei/debugfs.c +++ b/drivers/misc/mei/debugfs.c @@ -204,6 +204,8 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name) if (!dir) return -ENOMEM; + dev->dbgfs_dir = dir; + f = debugfs_create_file("meclients", S_IRUSR, dir, dev, &mei_dbgfs_fops_meclients); if (!f) { @@ -228,7 +230,6 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name) dev_err(dev->dev, "allow_fixed_address: registration failed\n"); goto err; } - dev->dbgfs_dir = dir; return 0; err: mei_dbgfs_deregister(dev); |