History

Merge tag 'iio-fixes-for-3.11a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Jonathan writes: The first round of IIO fixes for the 3.11 cycle. This set is larger than I would like, partly due to my lack of review time in the weeks before the merge window and partly because a couple of large drivers and the subsystem as a whole seem to be getting a lot more exposure and testing recently. 1) A long term bug in trigger handling gave a double free of the device. 2) Wrong return value handling means offsets are ignored in iio_convert_raw_to_processed_unlocked. 3) The iio_channel_has_info utility function was incorrectly updated during the recent info_mask split, this is now fixed. 4) mxs-lradc has a couple of little fixes. 5) A couple of missing .driver_module entries meant that drivers could be removed from underneath their users. 6) Error path fixes for ad7303 and lis3l02dq. 7) The scale value for presure in the lps331ap driver was out by a factor of 100.

Greg Kroah-Hartman committed 13 years ago

Commit 78077252 parents ade7615 67dbf549 files · +22 −18Browse files

Showing the changes to include/linux (1 of 9 files). Show all

Unified · Split

include/linux/iio/iio.h+2−2
@@ -211,8 +211,8 @@ struct iio_chan_spec { · 210 unmodified lines
211211 static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
212212 enum iio_chan_info_enum type)
213213 {
214− return (chan->info_mask_separate & type) |
215− (chan->info_mask_shared_by_type & type);
214+ return (chan->info_mask_separate & BIT(type)) |
215+ (chan->info_mask_shared_by_type & BIT(type));
216216 }
217217
218218 #define IIO_ST(si, rb, sb, sh) \