diff options
author | Sachin Kamat <sachin.kamat@samsung.com> | 2014-03-07 02:44:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2014-07-05 06:04:48 -0400 |
commit | 2f084c17562a3a20ee0cc11d3863ca5e8fd4e10b (patch) | |
tree | d18723c7e652534ddcc653be8054ee32a5be4a4c | |
parent | 6c3d8d4f05ec477f68615dc6120c46fec64a2268 (diff) |
iio: hid-sensor-accel-3d: 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: Sachin Kamat <sachin.kamat@samsung.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | drivers/iio/accel/hid-sensor-accel-3d.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c index 69abf9163df7..54e464e4bb72 100644 --- a/drivers/iio/accel/hid-sensor-accel-3d.c +++ b/drivers/iio/accel/hid-sensor-accel-3d.c | |||
@@ -110,7 +110,6 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev, | |||
110 | struct accel_3d_state *accel_state = iio_priv(indio_dev); | 110 | struct accel_3d_state *accel_state = iio_priv(indio_dev); |
111 | int report_id = -1; | 111 | int report_id = -1; |
112 | u32 address; | 112 | u32 address; |
113 | int ret; | ||
114 | int ret_type; | 113 | int ret_type; |
115 | s32 poll_value; | 114 | s32 poll_value; |
116 | 115 | ||
@@ -151,14 +150,12 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev, | |||
151 | ret_type = IIO_VAL_INT; | 150 | ret_type = IIO_VAL_INT; |
152 | break; | 151 | break; |
153 | case IIO_CHAN_INFO_SAMP_FREQ: | 152 | case IIO_CHAN_INFO_SAMP_FREQ: |
154 | ret = hid_sensor_read_samp_freq_value( | 153 | ret_type = hid_sensor_read_samp_freq_value( |
155 | &accel_state->common_attributes, val, val2); | 154 | &accel_state->common_attributes, val, val2); |
156 | ret_type = IIO_VAL_INT_PLUS_MICRO; | ||
157 | break; | 155 | break; |
158 | case IIO_CHAN_INFO_HYSTERESIS: | 156 | case IIO_CHAN_INFO_HYSTERESIS: |
159 | ret = hid_sensor_read_raw_hyst_value( | 157 | ret_type = hid_sensor_read_raw_hyst_value( |
160 | &accel_state->common_attributes, val, val2); | 158 | &accel_state->common_attributes, val, val2); |
161 | ret_type = IIO_VAL_INT_PLUS_MICRO; | ||
162 | break; | 159 | break; |
163 | default: | 160 | default: |
164 | ret_type = -EINVAL; | 161 | ret_type = -EINVAL; |