diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 13:21:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 13:21:28 -0700 |
| commit | ed15e8880fc3d8d52bc02a02521054bfcb26264a (patch) | |
| tree | 816a7f35028762976f5d4bc4df172e407c4bcbe2 /drivers/iio/temperature | |
| parent | b8d1f261fe7e4967593a5637d62991b6197a03f8 (diff) | |
| parent | 52721d9d3334c1cb1f76219a161084094ec634dc (diff) | |
Merge 4.2-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/temperature')
| -rw-r--r-- | drivers/iio/temperature/tmp006.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/iio/temperature/tmp006.c b/drivers/iio/temperature/tmp006.c index 395df23d7c8c..e78c1069a6a9 100644 --- a/drivers/iio/temperature/tmp006.c +++ b/drivers/iio/temperature/tmp006.c @@ -132,6 +132,9 @@ static int tmp006_write_raw(struct iio_dev *indio_dev, struct tmp006_data *data = iio_priv(indio_dev); int i; + if (mask != IIO_CHAN_INFO_SAMP_FREQ) + return -EINVAL; + for (i = 0; i < ARRAY_SIZE(tmp006_freqs); i++) if ((val == tmp006_freqs[i][0]) && (val2 == tmp006_freqs[i][1])) { |