diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2017-03-09 11:20:04 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2017-03-13 16:42:34 -0400 |
commit | c42f8218610aa09d7d3795e5810387673c1f84b6 (patch) | |
tree | 944622493cecd4f6d98e01694587d04c4eb020b7 | |
parent | 3ff861f59f6c1f5bf2bc03d2cd36ac3f992cbc06 (diff) |
iio: sw-device: Fix config group initialization
Use the IS_ENABLED() helper macro to ensure that the configfs group is
initialized either when configfs is built-in or when configfs is built as a
module. Otherwise software device creation will result in undefined
behaviour when configfs is built as a module since the configfs group for
the device not properly initialized.
Similar to commit b2f0c09664b7 ("iio: sw-trigger: Fix config group
initialization").
Fixes: 0f3a8c3f34f7 ("iio: Add support for creating IIO devices via configfs")
Reported-by: Miguel Robles <miguel.robles@farole.net>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Daniel Baluta <daniel.baluta@gmail.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | include/linux/iio/sw_device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iio/sw_device.h b/include/linux/iio/sw_device.h index 23ca41515527..fa7931933067 100644 --- a/include/linux/iio/sw_device.h +++ b/include/linux/iio/sw_device.h | |||
@@ -62,7 +62,7 @@ void iio_swd_group_init_type_name(struct iio_sw_device *d, | |||
62 | const char *name, | 62 | const char *name, |
63 | struct config_item_type *type) | 63 | struct config_item_type *type) |
64 | { | 64 | { |
65 | #ifdef CONFIG_CONFIGFS_FS | 65 | #if IS_ENABLED(CONFIG_CONFIGFS_FS) |
66 | config_group_init_type_name(&d->group, name, type); | 66 | config_group_init_type_name(&d->group, name, type); |
67 | #endif | 67 | #endif |
68 | } | 68 | } |