diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-06 11:33:04 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-06 11:33:04 -0800 |
| commit | d62994701b1e38794a6e4dfc54beb9ae98d3d822 (patch) | |
| tree | 648ea7f2e0ccb8cfe9f52fc3fc7ec351678a2004 /drivers/iio/adc/vf610_adc.c | |
| parent | 843a01f20af180d238cfcb5456e30404c2f4cc37 (diff) | |
| parent | db8fa7311d1ce642134c53e175ca0ae35e021344 (diff) | |
| download | op-kernel-dev-d62994701b1e38794a6e4dfc54beb9ae98d3d822.zip op-kernel-dev-d62994701b1e38794a6e4dfc54beb9ae98d3d822.tar.gz | |
Merge tag 'iio-for-3.15c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Third IIO new drivers and cleanups series for 3.15.
New driver
* Xilinx XADC driver - This has been ready for a while but was awaiting
a device tree ack (or as it turns out 3+ weeks).
Cleanup
* Drop some unreachable code from mag3110 highlighted by smatch.
Fix
* vf610 - introduced this cycle - put a possible negative error code
into an unsigned long. Another smatch find - this one promoted by
guilt that Dan was busy fixing all our messups.
Diffstat (limited to 'drivers/iio/adc/vf610_adc.c')
| -rw-r--r-- | drivers/iio/adc/vf610_adc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c index 37f542e..44799eb5 100644 --- a/drivers/iio/adc/vf610_adc.c +++ b/drivers/iio/adc/vf610_adc.c @@ -447,7 +447,7 @@ static int vf610_read_raw(struct iio_dev *indio_dev, { struct vf610_adc *info = iio_priv(indio_dev); unsigned int hc_cfg; - unsigned long ret; + long ret; switch (mask) { case IIO_CHAN_INFO_RAW: |
