aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/iio/industrialio-event.c12
-rw-r--r--include/linux/iio/types.h1
2 files changed, 10 insertions, 3 deletions
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index 0c1e37e3120a..1290290adcb5 100644
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -327,9 +327,15 @@ static int iio_device_add_event(struct iio_dev *indio_dev,
327 for_each_set_bit(i, mask, sizeof(*mask)*8) { 327 for_each_set_bit(i, mask, sizeof(*mask)*8) {
328 if (i >= ARRAY_SIZE(iio_ev_info_text)) 328 if (i >= ARRAY_SIZE(iio_ev_info_text))
329 return -EINVAL; 329 return -EINVAL;
330 postfix = kasprintf(GFP_KERNEL, "%s_%s_%s", 330 if (dir != IIO_EV_DIR_NONE)
331 iio_ev_type_text[type], iio_ev_dir_text[dir], 331 postfix = kasprintf(GFP_KERNEL, "%s_%s_%s",
332 iio_ev_info_text[i]); 332 iio_ev_type_text[type],
333 iio_ev_dir_text[dir],
334 iio_ev_info_text[i]);
335 else
336 postfix = kasprintf(GFP_KERNEL, "%s_%s",
337 iio_ev_type_text[type],
338 iio_ev_info_text[i]);
333 if (postfix == NULL) 339 if (postfix == NULL)
334 return -ENOMEM; 340 return -ENOMEM;
335 341
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index b3a241d53b54..52cb5329407b 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -86,6 +86,7 @@ enum iio_event_direction {
86 IIO_EV_DIR_EITHER, 86 IIO_EV_DIR_EITHER,
87 IIO_EV_DIR_RISING, 87 IIO_EV_DIR_RISING,
88 IIO_EV_DIR_FALLING, 88 IIO_EV_DIR_FALLING,
89 IIO_EV_DIR_NONE,
89}; 90};
90 91
91#define IIO_VAL_INT 1 92#define IIO_VAL_INT 1