summaryrefslogtreecommitdiff
path: root/include/linux/iio/sw_device.h
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2017-03-09 17:20:04 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-30 09:41:25 +0200
commitcf43d679ccc51a11fe4488bfc13389fa634ddaee (patch)
treebdef4ca01aa0d4c48513f8216b2817588222578b /include/linux/iio/sw_device.h
parentec271b0e05b2ed74aec842b97fc61a4599d81f4c (diff)
iio: sw-device: Fix config group initialization
commit c42f8218610aa09d7d3795e5810387673c1f84b6 upstream. 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> Signed-off-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/iio/sw_device.h')
-rw-r--r--include/linux/iio/sw_device.h2
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,
const char *name,
struct config_item_type *type)
{
-#ifdef CONFIG_CONFIGFS_FS
+#if IS_ENABLED(CONFIG_CONFIGFS_FS)
config_group_init_type_name(&d->group, name, type);
#endif
}