Explorar o código

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>
Sachin Kamat %!s(int64=11) %!d(string=hai) anos
pai
achega
2f084c1756
Modificáronse 1 ficheiros con 2 adicións e 5 borrados
  1. 2 5
      drivers/iio/accel/hid-sensor-accel-3d.c

+ 2 - 5
drivers/iio/accel/hid-sensor-accel-3d.c

@@ -110,7 +110,6 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
 	struct accel_3d_state *accel_state = iio_priv(indio_dev);
 	struct accel_3d_state *accel_state = iio_priv(indio_dev);
 	int report_id = -1;
 	int report_id = -1;
 	u32 address;
 	u32 address;
-	int ret;
 	int ret_type;
 	int ret_type;
 	s32 poll_value;
 	s32 poll_value;
 
 
@@ -151,14 +150,12 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
 		ret_type = IIO_VAL_INT;
 		ret_type = IIO_VAL_INT;
 		break;
 		break;
 	case IIO_CHAN_INFO_SAMP_FREQ:
 	case IIO_CHAN_INFO_SAMP_FREQ:
-		ret = hid_sensor_read_samp_freq_value(
+		ret_type = hid_sensor_read_samp_freq_value(
 			&accel_state->common_attributes, val, val2);
 			&accel_state->common_attributes, val, val2);
-		ret_type = IIO_VAL_INT_PLUS_MICRO;
 		break;
 		break;
 	case IIO_CHAN_INFO_HYSTERESIS:
 	case IIO_CHAN_INFO_HYSTERESIS:
-		ret = hid_sensor_read_raw_hyst_value(
+		ret_type = hid_sensor_read_raw_hyst_value(
 			&accel_state->common_attributes, val, val2);
 			&accel_state->common_attributes, val, val2);
-		ret_type = IIO_VAL_INT_PLUS_MICRO;
 		break;
 		break;
 	default:
 	default:
 		ret_type = -EINVAL;
 		ret_type = -EINVAL;