lkml.org 
[lkml]   [2014]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/10] iio: imu: kmx61: Don't ignore kmx61_set_power_state errors
    Date
    ..except while in an error handler, where there is nothing
    to be done anyway.

    Signed-off-by: Daniel Baluta <daniel.baluta@intel.com>
    ---
    drivers/iio/imu/kmx61.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c
    index fe0cee7..e9cbd91 100644
    --- a/drivers/iio/imu/kmx61.c
    +++ b/drivers/iio/imu/kmx61.c
    @@ -830,7 +830,12 @@ static int kmx61_read_raw(struct iio_dev *indio_dev,
    }
    mutex_lock(&data->lock);

    - kmx61_set_power_state(data, true, chan->address);
    + ret = kmx61_set_power_state(data, true, chan->address);
    + if (ret) {
    + mutex_unlock(&data->lock);
    + return ret;
    + }
    +
    ret = kmx61_read_measurement(data, base_reg, chan->scan_index);
    if (ret < 0) {
    kmx61_set_power_state(data, false, chan->address);
    @@ -839,9 +844,11 @@ static int kmx61_read_raw(struct iio_dev *indio_dev,
    }
    *val = sign_extend32(ret >> chan->scan_type.shift,
    chan->scan_type.realbits - 1);
    - kmx61_set_power_state(data, false, chan->address);
    + ret = kmx61_set_power_state(data, false, chan->address);

    mutex_unlock(&data->lock);
    + if (ret)
    + return ret;
    return IIO_VAL_INT;
    case IIO_CHAN_INFO_SCALE:
    switch (chan->type) {
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-12-23 15:01    [W:2.929 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site