openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'work-next' into staging-next

This commit is contained in:
Greg Kroah-Hartman 2011-12-08 12:22:28 -08:00
parent 19324328ad 5a2a6e1162
commit 106e7cf3bd
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/iio/industrialio-buffer.c
View File

@ -173,7 +173,7 @@ static ssize_t iio_scan_el_store(struct device *dev,
error_ret:
mutex_unlock(&indio_dev->mlock);
return ret ? ret : len;
return ret < 0 ? ret : len;
}
@ -624,16 +624,8 @@ int iio_scan_mask_query(struct iio_dev *indio_dev,
if (!buffer->scan_mask)
return 0;
if (indio_dev->available_scan_masks)
mask = iio_scan_mask_match(indio_dev->available_scan_masks,
indio_dev->masklength,
buffer->scan_mask);
else
mask = buffer->scan_mask;
if (!mask)
return 0;
return test_bit(bit, mask);
return test_bit(bit, buffer->scan_mask);
};
EXPORT_SYMBOL_GPL(iio_scan_mask_query);