diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 11:11:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 11:11:22 +0200 |
| commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
| tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /drivers/iio/adc/ad799x.c | |
| parent | 7440850c20b69658f322119d20a94dc914127cc7 (diff) | |
| parent | 00ef99408b6cc8d86ca614ada8025aa3606860db (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'drivers/iio/adc/ad799x.c')
| -rw-r--r-- | drivers/iio/adc/ad799x.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c index 39b4cb48d738..6eba301ee03d 100644 --- a/drivers/iio/adc/ad799x.c +++ b/drivers/iio/adc/ad799x.c @@ -427,9 +427,12 @@ static int ad799x_write_event_value(struct iio_dev *indio_dev, int ret; struct ad799x_state *st = iio_priv(indio_dev); + if (val < 0 || val > RES_MASK(chan->scan_type.realbits)) + return -EINVAL; + mutex_lock(&indio_dev->mlock); ret = ad799x_i2c_write16(st, ad799x_threshold_reg(chan, dir, info), - val); + val << chan->scan_type.shift); mutex_unlock(&indio_dev->mlock); return ret; @@ -452,7 +455,8 @@ static int ad799x_read_event_value(struct iio_dev *indio_dev, mutex_unlock(&indio_dev->mlock); if (ret < 0) return ret; - *val = valin; + *val = (valin >> chan->scan_type.shift) & + RES_MASK(chan->scan_type.realbits); return IIO_VAL_INT; } |