diff options
author | Peter Meerwald <pmeerw@pmeerw.net> | 2014-05-06 04:53:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2014-06-07 06:50:34 -0400 |
commit | 8ba42fb7b17649c9ab5b5e79d4e90370a0b4645e (patch) | |
tree | cea3b4d35b3122f183e5e35c965117618c3caa2b | |
parent | 6d4eed9e8e31a855ea6e6969562774e15f7a6849 (diff) |
iio: Fix endianness issue in ak8975_read_axis()
i2c_smbus_read_word_data() does host endian conversion already,
no need for le16_to_cpu()
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Cc: Stable@vger.kernel.org
-rw-r--r-- | drivers/iio/magnetometer/ak8975.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c index 74866d1efd1b..2a524acabec8 100644 --- a/drivers/iio/magnetometer/ak8975.c +++ b/drivers/iio/magnetometer/ak8975.c | |||
@@ -352,8 +352,6 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val) | |||
352 | { | 352 | { |
353 | struct ak8975_data *data = iio_priv(indio_dev); | 353 | struct ak8975_data *data = iio_priv(indio_dev); |
354 | struct i2c_client *client = data->client; | 354 | struct i2c_client *client = data->client; |
355 | u16 meas_reg; | ||
356 | s16 raw; | ||
357 | int ret; | 355 | int ret; |
358 | 356 | ||
359 | mutex_lock(&data->lock); | 357 | mutex_lock(&data->lock); |
@@ -401,16 +399,11 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val) | |||
401 | dev_err(&client->dev, "Read axis data fails\n"); | 399 | dev_err(&client->dev, "Read axis data fails\n"); |
402 | goto exit; | 400 | goto exit; |
403 | } | 401 | } |
404 | meas_reg = ret; | ||
405 | 402 | ||
406 | mutex_unlock(&data->lock); | 403 | mutex_unlock(&data->lock); |
407 | 404 | ||
408 | /* Endian conversion of the measured values. */ | ||
409 | raw = (s16) (le16_to_cpu(meas_reg)); | ||
410 | |||
411 | /* Clamp to valid range. */ | 405 | /* Clamp to valid range. */ |
412 | raw = clamp_t(s16, raw, -4096, 4095); | 406 | *val = clamp_t(s16, ret, -4096, 4095); |
413 | *val = raw; | ||
414 | return IIO_VAL_INT; | 407 | return IIO_VAL_INT; |
415 | 408 | ||
416 | exit: | 409 | exit: |