提交 2b4ec22d 编写于 作者: J Jonathan Cameron

Merge branch 'fixes-togreg' into togreg

...@@ -522,7 +522,7 @@ static ssize_t ad9523_store(struct device *dev, ...@@ -522,7 +522,7 @@ static ssize_t ad9523_store(struct device *dev,
return ret; return ret;
if (!state) if (!state)
return 0; return len;
mutex_lock(&st->lock); mutex_lock(&st->lock);
switch ((u32)this_attr->address) { switch ((u32)this_attr->address) {
......
...@@ -838,7 +838,7 @@ static int si1133_write_raw(struct iio_dev *iio_dev, ...@@ -838,7 +838,7 @@ static int si1133_write_raw(struct iio_dev *iio_dev,
switch (chan->type) { switch (chan->type) {
case IIO_INTENSITY: case IIO_INTENSITY:
case IIO_UVINDEX: case IIO_UVINDEX:
if (val != 0 || val != 1) if (val != 0 && val != 1)
return -EINVAL; return -EINVAL;
return si1133_update_adcsens(data, return si1133_update_adcsens(data,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册