| Date | Sun, 01 Jul 2012 18:20:07 +0100 | From | Ben Hutchings <> | Subject | [ 01/48] staging:iio:ad7606: Re-add missing scale attribute |
| |
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <lars@metafoo.de>
commit 279bf2e57c30c9a4482b2b6ede11b31c41e35e78 upstream.
Commit 50ac23be ("staging:iio:adc:ad7606 add local define for chan_spec structures.") accidentally removed the scale info_mask flag. This patch adds it back again.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [bwh: Backported to 3.2: - info_mask was completely gone rather than set to another flag - IIO_CHAN_INFO_SCALE_SHARED_BIT was not defined; write it out as a shift] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- --- a/drivers/staging/iio/adc/ad7606_core.c +++ b/drivers/staging/iio/adc/ad7606_core.c @@ -241,6 +241,7 @@ .indexed = 1, \ .channel = num, \ .address = num, \ + .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED), \ .scan_index = num, \ .scan_type = IIO_ST('s', 16, 16, 0), \ }
|