diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-15 13:59:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-15 13:59:53 +0300 |
| commit | aa444bd230f832d4e75cfac826255cfd66f545c3 (patch) | |
| tree | ea3a369a17bc486030d653f5faa7223bb1c50841 /drivers/staging | |
| parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) | |
| parent | ca4c302398963c0cae29bc168e44cf91e40ff0d3 (diff) | |
| download | linux-aa444bd230f832d4e75cfac826255cfd66f545c3.tar.xz | |
Merge tag 'iio-fixes-for-4.14b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
Second set of IIO fixes for the 4.14 cycle.
* ade7759
- Fix a signed extension bug.
* as3935
- The default noise and watch dog settings were such that the device
was unusuable in most applications. Add device tree parameters to
allow it to be configured to something that will actually work.
* at91-sama5d2 adc
- Fix handling of legacy device trees that don't provide the new
trigger edge property.
* dln2-adc
- Fix a missing Kconfig dependency on IIO_TRIGGERED_BUFFER.
* dummy driver
- Add a missing break so that writing in_voltage0_thresh_rising_en
doesn't always result in an error.
* zpa2326
- Drop a test for an always true condition so that gcc won't spit out
and unused variable warning.
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/meter/ade7759.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c index 1691760339da..02573c517d9d 100644 --- a/drivers/staging/iio/meter/ade7759.c +++ b/drivers/staging/iio/meter/ade7759.c @@ -172,7 +172,7 @@ static int ade7759_spi_read_reg_40(struct device *dev, reg_address); goto error_ret; } - *val = ((u64)st->rx[1] << 32) | (st->rx[2] << 24) | + *val = ((u64)st->rx[1] << 32) | ((u64)st->rx[2] << 24) | (st->rx[3] << 16) | (st->rx[4] << 8) | st->rx[5]; error_ret: |