]> git.itanic.dy.fi Git - linux-stable/commitdiff
staging: iio: ad5933: fix type mismatch regression
authorDavid Schiller <david.schiller@jku.at>
Mon, 22 Jan 2024 13:49:17 +0000 (14:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Feb 2024 07:55:06 +0000 (08:55 +0100)
commit 6db053cd949fcd6254cea9f2cd5d39f7bd64379c upstream.

Commit 4c3577db3e4f ("Staging: iio: impedance-analyzer: Fix sparse
warning") fixed a compiler warning, but introduced a bug that resulted
in one of the two 16 bit IIO channels always being zero (when both are
enabled).

This is because int is 32 bits wide on most architectures and in the
case of a little-endian machine the two most significant bytes would
occupy the buffer for the second channel as 'val' is being passed as a
void pointer to 'iio_push_to_buffers()'.

Fix by defining 'val' as u16. Tested working on ARM64.

Fixes: 4c3577db3e4f ("Staging: iio: impedance-analyzer: Fix sparse warning")
Signed-off-by: David Schiller <david.schiller@jku.at>
Link: https://lore.kernel.org/r/20240122134916.2137957-1-david.schiller@jku.at
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/iio/impedance-analyzer/ad5933.c

index 793918e1c45fa400ce3189ffb0b7b71079f0ea7a..b682d0f94b0b63017844bd9d1e16c46c5129d190 100644 (file)
@@ -608,7 +608,7 @@ static void ad5933_work(struct work_struct *work)
                struct ad5933_state, work.work);
        struct iio_dev *indio_dev = i2c_get_clientdata(st->client);
        __be16 buf[2];
-       int val[2];
+       u16 val[2];
        unsigned char status;
        int ret;