aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristina Ciocan <cristina.ciocan@intel.com>2014-11-11 16:07:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-06 15:05:47 -0800
commit8743a13960c87427b29e2c8b3b6ea2c6f9313f7c (patch)
tree80d958dca9afe2dee0136f5c0b1b6774471a1fbe
parent1e7500e0cbffc4bc6619ffd1ca7b34825c54de00 (diff)
downloadlinux-linaro-stable-8743a13960c87427b29e2c8b3b6ea2c6f9313f7c.tar.gz
iio: Fix IIO_EVENT_CODE_EXTRACT_DIR bit mask
commit ccf54555da9a5e91e454b909ca6a5303c7d6b910 upstream. The direction field is set on 7 bits, thus we need to AND it with 0111 111 mask in order to retrieve it, that is 0x7F, not 0xCF as it is now. Fixes: ade7ef7ba (staging:iio: Differential channel handling) Signed-off-by: Cristina Ciocan <cristina.ciocan@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/linux/iio/events.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iio/events.h b/include/linux/iio/events.h
index 13ce220c7003..593ae7ce07c7 100644
--- a/include/linux/iio/events.h
+++ b/include/linux/iio/events.h
@@ -90,7 +90,7 @@ enum iio_event_direction {
#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
-#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xCF)
+#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0x7F)
#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)