Commit c894acc7 authored by Colin Ian King's avatar Colin Ian King Committed by Jonathan Cameron

iio: hid-sensor: fix return of -EINVAL on invalid values in ret or value

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: 5d9854ea ("iio: hid-sensor: Store restore poll and hysteresis on S3")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent c3666219
...@@ -230,7 +230,7 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st, ...@@ -230,7 +230,7 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
ret = sensor_hub_set_feature(st->hsdev, st->poll.report_id, ret = sensor_hub_set_feature(st->hsdev, st->poll.report_id,
st->poll.index, sizeof(value), &value); st->poll.index, sizeof(value), &value);
if (ret < 0 || value < 0) if (ret < 0 || value < 0)
ret = -EINVAL; return -EINVAL;
ret = sensor_hub_get_feature(st->hsdev, ret = sensor_hub_get_feature(st->hsdev,
st->poll.report_id, st->poll.report_id,
...@@ -283,7 +283,7 @@ int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st, ...@@ -283,7 +283,7 @@ int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
st->sensitivity.index, sizeof(value), st->sensitivity.index, sizeof(value),
&value); &value);
if (ret < 0 || value < 0) if (ret < 0 || value < 0)
ret = -EINVAL; return -EINVAL;
ret = sensor_hub_get_feature(st->hsdev, ret = sensor_hub_get_feature(st->hsdev,
st->sensitivity.report_id, st->sensitivity.report_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment