diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-24 11:50:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-24 11:50:13 +0300 |
| commit | 8b77eb97f7847d67129d5312596e953bd7946f48 (patch) | |
| tree | 754eca1f2ca367b93cead00c4135056b4ab9fcbe /drivers/staging | |
| parent | c89d98e224b4858f42a9fec0f16766b3d7669ba3 (diff) | |
| parent | 64bc2d02d754f4143d65cc21c644176db12ab5c8 (diff) | |
| download | linux-8b77eb97f7847d67129d5312596e953bd7946f48.tar.xz | |
Merge tag 'iio-fixes-for-4.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
First set of IIO fixes for the 4.9 cycle.
* atlas chemical
- Fix alignment of big endian values in a larger storage (by using the right
size storage)
* maxim thermocouple
- Fix alignment of big endian values in larger (by using the correct
sized storage).
* sca3000
- Handle unexpected mode values.
* ti-adc081
- Select IIO_TRIGGERED_BUFFER to avoid build errors
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/accel/sca3000_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c index d626125d7af9..564b36d4f648 100644 --- a/drivers/staging/iio/accel/sca3000_core.c +++ b/drivers/staging/iio/accel/sca3000_core.c @@ -468,6 +468,8 @@ static inline int __sca3000_get_base_freq(struct sca3000_state *st, case SCA3000_MEAS_MODE_OP_2: *base_freq = info->option_mode_2_freq; break; + default: + ret = -EINVAL; } error_ret: return ret; |