[v2,4/4] iio: imu: inv_mpu6050: clean read channel data error path

Commit Message

Jean-Baptiste Maneyrol April 9, 2018, 2:59 p.m. UTC

Signed-off-by: Jean-Baptiste Maneyrol <[e-mail]>
---
  drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)

  	if (result)
@@ -369,14 +369,18 @@ static int inv_mpu6050_read_channel_data(struct 
iio_dev *indio_dev,
  		break;
  	}

-error_power_off:
-	result |= inv_mpu6050_set_power_itg(st, false);
-error_release:
-	iio_device_release_direct_mode(indio_dev);
+	result = inv_mpu6050_set_power_itg(st, false);
  	if (result)
-		return result;
+		goto error_power_off;
+	iio_device_release_direct_mode(indio_dev);

  	return ret;
+
+error_power_off:
+	inv_mpu6050_set_power_itg(st, false);
+error_release:
+	iio_device_release_direct_mode(indio_dev);
+	return result;
  }

  static int

Patch

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c 
b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index 50d352f..02437ed 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -324,7 +324,7 @@  static int inv_mpu6050_read_channel_data(struct 
iio_dev *indio_dev,
  {
  	struct inv_mpu6050_state *st = iio_priv(indio_dev);
  	int result;
-	int ret = IIO_VAL_INT;
+	int ret;

  	result = iio_device_claim_direct_mode(indio_dev);