summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubbaraya Sundeep Bhatta2014-11-09 10:55:00 +0100
committerJonathan Cameron2014-09-14 19:18:22 +0200
commit1887e724e2b6df06847522fe9dc2ab53639516cc (patch)
treec89e89ede791bc567e91d5b97711678c29034fcd
parentiio: meter: ade7758: Fix indio_dev->trig assignment (diff)
downloadkernel-qcow2-linux-1887e724e2b6df06847522fe9dc2ab53639516cc.tar.gz
kernel-qcow2-linux-1887e724e2b6df06847522fe9dc2ab53639516cc.tar.xz
kernel-qcow2-linux-1887e724e2b6df06847522fe9dc2ab53639516cc.zip
iio: adc: xilinx-xadc: assign auxiliary channels address correctly
This patch fixes incorrect logic for assigning address to auxiliary channels of xilinx xadc. Signed-off-by: Subbaraya Sundeep Bhatta <sbhatta@xilinx.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Cc: Stable@vger.kernel.org Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/adc/xilinx-xadc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index fd2745c62943..626b39749767 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -1126,7 +1126,7 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np,
chan->address = XADC_REG_VPVN;
} else {
chan->scan_index = 15 + reg;
- chan->scan_index = XADC_REG_VAUX(reg - 1);
+ chan->address = XADC_REG_VAUX(reg - 1);
}
num_channels++;
chan++;