diff options
author | Peter Meerwald <pmeerw@pmeerw.net> | 2014-05-06 09:53:00 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-26 15:12:41 -0400 |
commit | a6e3a4df4c6888337dcbfce8b831c98cd3c886a4 (patch) | |
tree | a96ed891b0f2b5bfe94e172bba0e89d24e82a3d1 | |
parent | 9e655732466125a675a3bb8b0ebedfc921dfdcd5 (diff) | |
download | linux-stable-a6e3a4df4c6888337dcbfce8b831c98cd3c886a4.tar.gz linux-stable-a6e3a4df4c6888337dcbfce8b831c98cd3c886a4.tar.bz2 linux-stable-a6e3a4df4c6888337dcbfce8b831c98cd3c886a4.zip |
iio: Fix endianness issue in ak8975_read_axis()
commit 8ba42fb7b17649c9ab5b5e79d4e90370a0b4645e upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 af6c320a534e..53f829004a03 100644 --- a/drivers/iio/magnetometer/ak8975.c +++ b/drivers/iio/magnetometer/ak8975.c @@ -276,8 +276,6 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val) { struct ak8975_data *data = iio_priv(indio_dev); struct i2c_client *client = data->client; - u16 meas_reg; - s16 raw; int ret; mutex_lock(&data->lock); @@ -322,16 +320,11 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val) dev_err(&client->dev, "Read axis data fails\n"); goto exit; } - meas_reg = ret; mutex_unlock(&data->lock); - /* Endian conversion of the measured values. */ - raw = (s16) (le16_to_cpu(meas_reg)); - /* Clamp to valid range. */ - raw = clamp_t(s16, raw, -4096, 4095); - *val = raw; + *val = clamp_t(s16, ret, -4096, 4095); return IIO_VAL_INT; exit: |