Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c

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++;