diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2013-05-04 09:19:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-05-22 17:14:57 -0400 |
commit | c80712c793febdf1b13ad0e1c71a051e071b3fd8 (patch) | |
tree | 144b3b14d42837b27e342a17a8f30b66b3f30653 | |
parent | c7b0cf3e712775e8e2015c2f4582864159540be6 (diff) |
staging/iio/mxs-lradc: fix preenable for multiple buffers
This fixes 'preenable failed: -EINVAL' error when using this driver.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index 2856b8fd44ad..163c638e4095 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c | |||
@@ -690,7 +690,6 @@ static void mxs_lradc_trigger_remove(struct iio_dev *iio) | |||
690 | static int mxs_lradc_buffer_preenable(struct iio_dev *iio) | 690 | static int mxs_lradc_buffer_preenable(struct iio_dev *iio) |
691 | { | 691 | { |
692 | struct mxs_lradc *lradc = iio_priv(iio); | 692 | struct mxs_lradc *lradc = iio_priv(iio); |
693 | struct iio_buffer *buffer = iio->buffer; | ||
694 | int ret = 0, chan, ofs = 0; | 693 | int ret = 0, chan, ofs = 0; |
695 | unsigned long enable = 0; | 694 | unsigned long enable = 0; |
696 | uint32_t ctrl4_set = 0; | 695 | uint32_t ctrl4_set = 0; |
@@ -698,7 +697,7 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio) | |||
698 | uint32_t ctrl1_irq = 0; | 697 | uint32_t ctrl1_irq = 0; |
699 | const uint32_t chan_value = LRADC_CH_ACCUMULATE | | 698 | const uint32_t chan_value = LRADC_CH_ACCUMULATE | |
700 | ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET); | 699 | ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET); |
701 | const int len = bitmap_weight(buffer->scan_mask, LRADC_MAX_TOTAL_CHANS); | 700 | const int len = bitmap_weight(iio->active_scan_mask, LRADC_MAX_TOTAL_CHANS); |
702 | 701 | ||
703 | if (!len) | 702 | if (!len) |
704 | return -EINVAL; | 703 | return -EINVAL; |
@@ -725,7 +724,7 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio) | |||
725 | lradc->base + LRADC_CTRL1 + STMP_OFFSET_REG_CLR); | 724 | lradc->base + LRADC_CTRL1 + STMP_OFFSET_REG_CLR); |
726 | writel(0xff, lradc->base + LRADC_CTRL0 + STMP_OFFSET_REG_CLR); | 725 | writel(0xff, lradc->base + LRADC_CTRL0 + STMP_OFFSET_REG_CLR); |
727 | 726 | ||
728 | for_each_set_bit(chan, buffer->scan_mask, LRADC_MAX_TOTAL_CHANS) { | 727 | for_each_set_bit(chan, iio->active_scan_mask, LRADC_MAX_TOTAL_CHANS) { |
729 | ctrl4_set |= chan << LRADC_CTRL4_LRADCSELECT_OFFSET(ofs); | 728 | ctrl4_set |= chan << LRADC_CTRL4_LRADCSELECT_OFFSET(ofs); |
730 | ctrl4_clr |= LRADC_CTRL4_LRADCSELECT_MASK(ofs); | 729 | ctrl4_clr |= LRADC_CTRL4_LRADCSELECT_MASK(ofs); |
731 | ctrl1_irq |= LRADC_CTRL1_LRADC_IRQ_EN(ofs); | 730 | ctrl1_irq |= LRADC_CTRL1_LRADC_IRQ_EN(ofs); |