lkml.org 
[lkml]   [2018]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 099/190] iio: hid-sensor: fix return of -EINVAL on invalid values in ret or value
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit c894acc7bf400d039bf740420b22f0b71b7fb504 ]

    Ensure that when an invalid value in ret or value is found -EINVAL
    is returned. A previous commit broke the way the return error is
    being returned and instead caused the return code in ret to be
    re-assigned rather than be returned.

    Fixes: 5d9854eaea776 ("iio: hid-sensor: Store restore poll and hysteresis on S3")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/iio/common/hid-sensors/hid-sensor-attributes.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
    index ab646a90e3da..af85db50412e 100644
    --- a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
    +++ b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
    @@ -215,7 +215,7 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
    ret = sensor_hub_set_feature(st->hsdev, st->poll.report_id,
    st->poll.index, sizeof(value), &value);
    if (ret < 0 || value < 0)
    - ret = -EINVAL;
    + return -EINVAL;

    ret = sensor_hub_get_feature(st->hsdev,
    st->poll.report_id,
    @@ -265,7 +265,7 @@ int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
    st->sensitivity.index, sizeof(value),
    &value);
    if (ret < 0 || value < 0)
    - ret = -EINVAL;
    + return -EINVAL;

    ret = sensor_hub_get_feature(st->hsdev,
    st->sensitivity.report_id,
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-08 06:02    [W:4.143 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site