diff options
| author | Brian Masney <masneyb@onstation.org> | 2018-05-10 20:12:21 -0400 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2018-05-12 12:23:06 +0100 |
| commit | da18e8906278b82774fe5181d98e1e37a62fc1e6 (patch) | |
| tree | 81e87955ac4e1323567393c538621b59348cbd5e /drivers/staging | |
| parent | 9861d2daaf28e7beaa0c655206c595094d47ccd8 (diff) | |
| download | linux-stable-da18e8906278b82774fe5181d98e1e37a62fc1e6.tar.gz linux-stable-da18e8906278b82774fe5181d98e1e37a62fc1e6.tar.bz2 linux-stable-da18e8906278b82774fe5181d98e1e37a62fc1e6.zip | |
staging: iio: tsl2x7x: add range checking to tsl2x7x_write_raw
The CALIBBIAS and INT_TIME masks in tsl2x7x_write_raw did not have any
range checking in place so this patch adds the appropriate range
checking. The defines TSL2X7X_ALS_GAIN_TRIM_{MIN,MAX} are also
introduced by this patch.
Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/light/tsl2x7x.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c index 0218eabcd6d7..f9500afab30c 100644 --- a/drivers/staging/iio/light/tsl2x7x.c +++ b/drivers/staging/iio/light/tsl2x7x.c @@ -103,6 +103,9 @@ #define TSL2X7X_CNTL_PROXPON_ENBL 0x0F #define TSL2X7X_CNTL_INTPROXPON_ENBL 0x2F +#define TSL2X7X_ALS_GAIN_TRIM_MIN 250 +#define TSL2X7X_ALS_GAIN_TRIM_MAX 4000 + /* TAOS txx2x7x Device family members */ enum { tsl2571, @@ -581,7 +584,7 @@ static int tsl2x7x_als_calibrate(struct iio_dev *indio_dev) ret = (chip->settings.als_cal_target * chip->settings.als_gain_trim) / lux_val; - if (ret < 250 || ret > 4000) + if (ret < TSL2X7X_ALS_GAIN_TRIM_MIN || ret > TSL2X7X_ALS_GAIN_TRIM_MAX) return -ERANGE; chip->settings.als_gain_trim = ret; @@ -1209,9 +1212,17 @@ static int tsl2x7x_write_raw(struct iio_dev *indio_dev, } break; case IIO_CHAN_INFO_CALIBBIAS: + if (val < TSL2X7X_ALS_GAIN_TRIM_MIN || + val > TSL2X7X_ALS_GAIN_TRIM_MAX) + return -EINVAL; + chip->settings.als_gain_trim = val; break; case IIO_CHAN_INFO_INT_TIME: + if (val != 0 || val2 < tsl2x7x_int_time_avail[chip->id][1] || + val2 > tsl2x7x_int_time_avail[chip->id][5]) + return -EINVAL; + chip->settings.als_time = 256 - (val2 / tsl2x7x_int_time_avail[chip->id][3]); break; |