summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-10-26 22:23:08 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-10-26 22:23:08 +0300
commit13fa692e3f86deed6c0d56b3004b694f0ccad3d4 (patch)
treedeae1936edb674d8e4f6260d509aee069bc9a1c7
parenta03885d596a622e25f655e280a3fcd9e754a37bd (diff)
parent82af5b6609673f1cc7d3453d0be3d292dfffc813 (diff)
downloadlinux-13fa692e3f86deed6c0d56b3004b694f0ccad3d4.tar.xz
Merge tag 'driver-core-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fix from Greg KH: "Here is a single sysfs fix for 5.4-rc5. It resolves an error if you actually try to use the __BIN_ATTR_WO() macro, seems I never tested it properly before :( This has been in linux-next for a while with no reported issues" * tag 'driver-core-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: sysfs: Fixes __BIN_ATTR_WO() macro
-rw-r--r--include/linux/sysfs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 5420817ed317..fa7ee503fb76 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -196,9 +196,9 @@ struct bin_attribute {
.size = _size, \
}
-#define __BIN_ATTR_WO(_name) { \
+#define __BIN_ATTR_WO(_name, _size) { \
.attr = { .name = __stringify(_name), .mode = 0200 }, \
- .store = _name##_store, \
+ .write = _name##_write, \
.size = _size, \
}