lkml.org 
[lkml]   [2014]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 071/181] iio: Fix endianness issue in ak8975_read_axis()
    Date
    From: Peter Meerwald <pmeerw@pmeerw.net>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/iio/magnetometer/ak8975.c | 9 +--------
    1 file changed, 1 insertion(+), 8 deletions(-)

    diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
    index 9edf4c935fd7..aeba3bbdadb0 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)
    {
    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);
    @@ -401,16 +399,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:
    --
    2.0.0


    \
     
     \ /
      Last update: 2014-06-30 15:21    [W:4.155 / U:0.540 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site