diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2013-07-01 10:20:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 17:07:23 -0400 |
commit | 8b68eefae0dbd8cdddb54af08c2b424f6da6f6ba (patch) | |
tree | 39ccc0450a0f993e8673901f89ecf537886ea054 /include/linux | |
parent | 88c0a794e5d9bcc29926e636cd1d6eb5c9dcb235 (diff) |
iio: Fix iio_channel_has_info
commit 1c297a66654a3295ae87e2b7f3724d214eb2b5ec upstream.
Since the info_mask split, iio_channel_has_info() is not working correctly.
info_mask_separate and info_mask_shared_by_type, it is not possible to compare
them directly with the iio_chan_info_enum enum. Correct that bit using the BIT()
macro.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/iio/iio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index 8d171f427632..3d35b7023591 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h | |||
@@ -211,8 +211,8 @@ struct iio_chan_spec { | |||
211 | static inline bool iio_channel_has_info(const struct iio_chan_spec *chan, | 211 | static inline bool iio_channel_has_info(const struct iio_chan_spec *chan, |
212 | enum iio_chan_info_enum type) | 212 | enum iio_chan_info_enum type) |
213 | { | 213 | { |
214 | return (chan->info_mask_separate & type) | | 214 | return (chan->info_mask_separate & BIT(type)) | |
215 | (chan->info_mask_shared_by_type & type); | 215 | (chan->info_mask_shared_by_type & BIT(type)); |
216 | } | 216 | } |
217 | 217 | ||
218 | #define IIO_ST(si, rb, sb, sh) \ | 218 | #define IIO_ST(si, rb, sb, sh) \ |