Commit 2b4ec22d authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

Merge branch 'fixes-togreg' into togreg

parents 2fa03b92 1e96e93a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,