git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[sfrench/cifs-2.6.git]
/
drivers
/
iio
/
industrialio-event.c
diff --git
a/drivers/iio/industrialio-event.c
b/drivers/iio/industrialio-event.c
index 258a973a1fb8da2d23457fe3afc139f0f9befcff..0c1e37e3120a40cf5f7a170339033204adf5770b 100644
(file)
--- a/
drivers/iio/industrialio-event.c
+++ b/
drivers/iio/industrialio-event.c
@@
-209,6
+209,7
@@
static const char * const iio_ev_info_text[] = {
[IIO_EV_INFO_ENABLE] = "en",
[IIO_EV_INFO_VALUE] = "value",
[IIO_EV_INFO_HYSTERESIS] = "hysteresis",
[IIO_EV_INFO_ENABLE] = "en",
[IIO_EV_INFO_VALUE] = "value",
[IIO_EV_INFO_HYSTERESIS] = "hysteresis",
+ [IIO_EV_INFO_PERIOD] = "period",
};
static enum iio_event_direction iio_ev_attr_dir(struct iio_dev_attr *attr)
};
static enum iio_event_direction iio_ev_attr_dir(struct iio_dev_attr *attr)
@@
-345,6
+346,9
@@
static int iio_device_add_event(struct iio_dev *indio_dev,
&indio_dev->event_interface->dev_attr_list);
kfree(postfix);
&indio_dev->event_interface->dev_attr_list);
kfree(postfix);
+ if ((ret == -EBUSY) && (shared_by != IIO_SEPARATE))
+ continue;
+
if (ret)
return ret;
if (ret)
return ret;