lkml.org 
[lkml]   [2014]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 023/121] iio: querying buffer scan_mask should return 0/1
    Date
    3.8.13.24 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alec Berg <alecaberg@chromium.org>

    commit 2076a20fc1a06f7b0333c62a2bb4eeeac7ed1bcb upstream.

    Ensure that querying the IIO buffer scan_mask returns a value of
    0 or 1. Currently querying the scan mask has the value returned
    by test_bit(), which returns either true or false. For some
    architectures test_bit() may return -1 for true, which will appear
    to return an error when returning from iio_scan_mask_query().

    Additionally, it's important for the sysfs interface to consistently
    return the same thing when querying the scan_mask.

    Signed-off-by: Alec Berg <alecaberg@chromium.org>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/iio/industrialio-buffer.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
    index aaadd32..d344cf3 100644
    --- a/drivers/iio/industrialio-buffer.c
    +++ b/drivers/iio/industrialio-buffer.c
    @@ -119,7 +119,8 @@ static ssize_t iio_scan_el_show(struct device *dev,
    int ret;
    struct iio_dev *indio_dev = dev_to_iio_dev(dev);

    - ret = test_bit(to_iio_dev_attr(attr)->address,
    + /* Ensure ret is 0 or 1. */
    + ret = !!test_bit(to_iio_dev_attr(attr)->address,
    indio_dev->buffer->scan_mask);

    return sprintf(buf, "%d\n", ret);
    @@ -762,7 +763,8 @@ int iio_scan_mask_query(struct iio_dev *indio_dev,
    if (!buffer->scan_mask)
    return 0;

    - return test_bit(bit, buffer->scan_mask);
    + /* Ensure return value is 0 or 1. */
    + return !!test_bit(bit, buffer->scan_mask);
    };
    EXPORT_SYMBOL_GPL(iio_scan_mask_query);

    --
    1.9.1


    \
     
     \ /
      Last update: 2014-06-18 04:01    [W:4.492 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site