]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: light: tcs3414: Use iio_push_to_buffers_with_ts() to allow source size runtime...
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 2 Aug 2025 16:44:32 +0000 (17:44 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 16 Aug 2025 14:56:47 +0000 (15:56 +0100)
Use iio_push_to_buffers_with_ts() to allow source size runtime check.

Also move the structure used as the source to the stack as it is only 16
bytes and not the target of an DMA or similar.

Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://patch.msgid.link/20250802164436.515988-13-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/light/tcs3414.c

index 39268f855c77d9a0b93183d6d14f20b3f10afe62..5be461e6dbdb12354a474b26109392c639b1eb86 100644 (file)
@@ -53,11 +53,6 @@ struct tcs3414_data {
        u8 control;
        u8 gain;
        u8 timing;
-       /* Ensure timestamp is naturally aligned */
-       struct {
-               u16 chans[4];
-               aligned_s64 timestamp;
-       } scan;
 };
 
 #define TCS3414_CHANNEL(_color, _si, _addr) { \
@@ -204,6 +199,12 @@ static irqreturn_t tcs3414_trigger_handler(int irq, void *p)
        struct iio_dev *indio_dev = pf->indio_dev;
        struct tcs3414_data *data = iio_priv(indio_dev);
        int i, j = 0;
+       /* Ensure timestamp is naturally aligned */
+       struct {
+               u16 chans[4];
+               aligned_s64 timestamp;
+       } scan = { };
+
 
        iio_for_each_active_channel(indio_dev, i) {
                int ret = i2c_smbus_read_word_data(data->client,
@@ -211,10 +212,10 @@ static irqreturn_t tcs3414_trigger_handler(int irq, void *p)
                if (ret < 0)
                        goto done;
 
-               data->scan.chans[j++] = ret;
+               scan.chans[j++] = ret;
        }
 
-       iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
+       iio_push_to_buffers_with_ts(indio_dev, &scan, sizeof(scan),
                iio_get_time_ns(indio_dev));
 
 done: