On Tue, Jul 10, 2012 at 01:27:09PM -0700, [email protected] wrote: > > The patch below does not apply to the 3.4-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <[email protected]>. > > thanks, > > greg k-h
The info_mask was still not used again in 3.4, this should apply ok on 3.4: >From 0ba8d8655be5dcee7746da1be4593b26f9c18162 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen <[email protected]> Date: Tue, 5 Jun 2012 18:16:31 +0200 Subject: [PATCH] staging:iio:ad7606: Re-add missing scale attribute 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 <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> [herton: Backported to 3.4: info_mask was not used yet with another flag] Signed-off-by: Herton R. Krzesinski <[email protected]> --- drivers/staging/iio/adc/ad7606_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c index 97e8d3d..7322c16 100644 --- a/drivers/staging/iio/adc/ad7606_core.c +++ b/drivers/staging/iio/adc/ad7606_core.c @@ -235,6 +235,7 @@ static const struct attribute_group ad7606_attribute_group_range = { .indexed = 1, \ .channel = num, \ .address = num, \ + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT, \ .scan_index = num, \ .scan_type = IIO_ST('s', 16, 16, 0), \ } -- 1.7.9.5 > > ------------------ original commit in Linus's tree ------------------ > > From 279bf2e57c30c9a4482b2b6ede11b31c41e35e78 Mon Sep 17 00:00:00 2001 > From: Lars-Peter Clausen <[email protected]> > Date: Tue, 5 Jun 2012 18:16:31 +0200 > Subject: [PATCH] staging:iio:ad7606: Re-add missing scale attribute > > 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 <[email protected]> > Cc: stable <[email protected]> [3.2+] > Acked-by: Jonathan Cameron <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > diff --git a/drivers/staging/iio/adc/ad7606_core.c > b/drivers/staging/iio/adc/ad7606_core.c > index 10ab6dc..a13afff 100644 > --- a/drivers/staging/iio/adc/ad7606_core.c > +++ b/drivers/staging/iio/adc/ad7606_core.c > @@ -235,7 +235,8 @@ static const struct attribute_group > ad7606_attribute_group_range = { > .indexed = 1, \ > .channel = num, \ > .address = num, \ > - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, \ > + .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ > + IIO_CHAN_INFO_SCALE_SHARED_BIT, \ > .scan_index = num, \ > .scan_type = IIO_ST('s', 16, 16, 0), \ > } > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- []'s Herton -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
