summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2016-07-11 13:50:01 +0200
committerJonathan Cameron <jic23@kernel.org>2016-08-15 15:39:09 +0100
commitb2f0c09664b72b2f8c581383a9337ac3092e42c8 (patch)
treeef0508ab300b20b46752aabeb91d087d9c060a00
parent776b645315d372e06e46167194605d308aa1a790 (diff)
downloadop-kernel-dev-b2f0c09664b72b2f8c581383a9337ac3092e42c8.zip
op-kernel-dev-b2f0c09664b72b2f8c581383a9337ac3092e42c8.tar.gz
iio: sw-trigger: 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 trigger creation will result in undefined behaviour when configfs is built as a mdoule since the configfs group for the trigger is not properly initialized. Fixes: b662f809d410 ("iio: core: Introduce IIO software triggers") Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Daniel Baluta <daniel.baluta@intel.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--include/linux/iio/sw_trigger.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iio/sw_trigger.h b/include/linux/iio/sw_trigger.h
index 5198f8e..c97eab6 100644
--- a/include/linux/iio/sw_trigger.h
+++ b/include/linux/iio/sw_trigger.h
@@ -62,7 +62,7 @@ void iio_swt_group_init_type_name(struct iio_sw_trigger *t,
const char *name,
struct config_item_type *type)
{
-#ifdef CONFIG_CONFIGFS_FS
+#if IS_ENABLED(CONFIG_CONFIGFS_FS)
config_group_init_type_name(&t->group, name, type);
#endif
}
OpenPOWER on IntegriCloud