iio: vcnl4000: Fix i2c swapped word reading.

The bytes returned by the i2c reading need to be swapped
unconditionally. Otherwise, on be16 platforms, an incorrect value will be
returned.

Taking the slow path via next merge window as its been around a while
and we have a patch set dependent on this which would be held up.

Fixes: ee9ab2473ad6 ("iio: add vcnl4000 combined ALS and proximity sensor")
Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index 985cc39ede8e1f6a87795218649da351f71d3466..979746a7d4116ea7f5b3dcd15ce1a5488a2b89d3 100644 (file)
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -220,7 +220,6 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
                                u8 rdy_mask, u8 data_reg, int *val)
 {
        int tries = 20;
-       __be16 buf;
        int ret;
 
        mutex_lock(&data->vcnl4000_lock);
@@ -247,13 +246,12 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
                goto fail;
        }
 
-       ret = i2c_smbus_read_i2c_block_data(data->client,
-               data_reg, sizeof(buf), (u8 *) &buf);
+       ret = i2c_smbus_read_word_swapped(data->client, data_reg);
        if (ret < 0)
                goto fail;
 
        mutex_unlock(&data->vcnl4000_lock);
-       *val = be16_to_cpu(buf);
+       *val = ret;
 
        return 0;