浏览代码

Merge branch 'fixes-togreg' into togreg

Jonathan Cameron 7 年之前
父节点
当前提交
2b4ec22d36
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/iio/frequency/ad9523.c
  2. 1 1
      drivers/iio/light/si1133.c

+ 1 - 1
drivers/iio/frequency/ad9523.c

@@ -522,7 +522,7 @@ static ssize_t ad9523_store(struct device *dev,
 		return ret;
 
 	if (!state)
-		return 0;
+		return len;
 
 	mutex_lock(&st->lock);
 	switch ((u32)this_attr->address) {

+ 1 - 1
drivers/iio/light/si1133.c

@@ -838,7 +838,7 @@ static int si1133_write_raw(struct iio_dev *iio_dev,
 		switch (chan->type) {
 		case IIO_INTENSITY:
 		case IIO_UVINDEX:
-			if (val != 0 || val != 1)
+			if (val != 0 && val != 1)
 				return -EINVAL;
 
 			return si1133_update_adcsens(data,