Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ff9f633 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron
Browse files

iio: hid-sensor-prox: Fix return values 



IIO_CHAN_INFO_SAMP_FREQ and IIO_CHAN_INFO_HYSTERESIS cases ignored
the actual return values (which could be -EINVAL) and instead
returned IIO_VAL_INT_PLUS_MICRO always. Return the actual value
obtained from the functions. Both functions return IIO_VAL_INT_PLUS_MICRO
upon success.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@samsung.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 27793803

drivers/iio/light/hid-sensor-prox.c

+2 −5
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ static int prox_read_raw(struct iio_dev *indio_dev, 
	struct prox_state *prox_state = iio_priv(indio_dev);

	int report_id = -1;

	u32 address;

	int ret;

	int ret_type;

	s32 poll_value;
@@ -125,14 +124,12 @@ static int prox_read_raw(struct iio_dev *indio_dev, 
		ret_type = IIO_VAL_INT;

		break;

	case IIO_CHAN_INFO_SAMP_FREQ:

		ret = hid_sensor_read_samp_freq_value(

		ret_type = hid_sensor_read_samp_freq_value(

				&prox_state->common_attributes, val, val2);

		ret_type = IIO_VAL_INT_PLUS_MICRO;

		break;

	case IIO_CHAN_INFO_HYSTERESIS:

		ret = hid_sensor_read_raw_hyst_value(

		ret_type = hid_sensor_read_raw_hyst_value(

				&prox_state->common_attributes, val, val2);

		ret_type = IIO_VAL_INT_PLUS_MICRO;

		break;

	default:

		ret_type = -EINVAL;