OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9e65573
)
iio: Fix endianness issue in ak8975_read_axis()
author
Peter Meerwald
<pmeerw@pmeerw.net>
Tue, 6 May 2014 08:53:00 +0000
(09:53 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 26 Jun 2014 19:12:41 +0000
(15:12 -0400)
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>
drivers/iio/magnetometer/ak8975.c
patch
|
blob
|
history
diff --git
a/drivers/iio/magnetometer/ak8975.c
b/drivers/iio/magnetometer/ak8975.c
index
af6c320
..
53f8290
100644
(file)
--- 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: