summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrina Tirdea <irina.tirdea@intel.com>2015-04-13 17:40:51 +0200
committerJonathan Cameron <jic23@kernel.org>2015-04-26 20:41:59 +0200
commitae2ec9597c9329fdf503af264966bc7e421daa58 (patch)
treeedf1014d3d564cc45af7e694d1700472f9bc5074
parentiio: accel: mma9551_core: prevent buffer overrun (diff)
downloadlinux-ae2ec9597c9329fdf503af264966bc7e421daa58.tar.xz
linux-ae2ec9597c9329fdf503af264966bc7e421daa58.zip
iio: accel: mma9553: add enable channel for activity
Add an enable channel for activity, so it can also be polled independently of events or other channels. Signed-off-by: Irina Tirdea <irina.tirdea@intel.com> Reported-by: Daniel Baluta <daniel.baluta@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/accel/mma9553.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c
index 607dbfcb49ab..1a256055a6f7 100644
--- a/drivers/iio/accel/mma9553.c
+++ b/drivers/iio/accel/mma9553.c
@@ -968,7 +968,8 @@ static const struct iio_chan_spec_ext_info mma9553_ext_info[] = {
.modified = 1, \
.channel2 = _chan2, \
.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), \
- .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_CALIBHEIGHT), \
+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_CALIBHEIGHT) | \
+ BIT(IIO_CHAN_INFO_ENABLE), \
.event_spec = mma9553_activity_events, \
.num_event_specs = ARRAY_SIZE(mma9553_activity_events), \
.ext_info = mma9553_ext_info, \