Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 22:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes-togreg' into togreg

Browse Source
This commit is contained in:
Jonathan Cameron 2018-08-01 18:56:17 +01:00
commit 2b4ec22d36
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iio/frequency/ad9523.c
View File

@ -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) {

2
drivers/iio/light/si1133.c
View File

@ -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,