From patchwork Mon Jul 19 14:50:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479870 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4217500jao; Mon, 19 Jul 2021 08:11:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsYD8y0R5YMIv0d2pY8Y4tPsBthitUaYKYrRxekQP/0hLJ0j2QXo6qnXDOHyqsTmLvxwMi X-Received: by 2002:a17:906:dc0f:: with SMTP id yy15mr27076925ejb.255.1626707519616; Mon, 19 Jul 2021 08:11:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707519; cv=none; d=google.com; s=arc-20160816; b=raoQmvlKsPiXZT1RO+u0Fd7qzZ8XuL99QGdna0A9AVk8bHg1nOJxN6PSGyCosEuc4A A/hIYPN5U6HHqJ4tzN6Uoa/Y1GUVzLeNMr9QZYkcUCvTDmfsz7LheCq8bRQ73ZLQbIqM c6cGLIRz4VmKRDCsUSUB9X/OQRMRpPStKIr9wTXwcmCxdu8XrGfG7Z0s5lEt6dGfgyIu mmUCo1IQ3bc4LAMEyiIcWpsYkjngCcVcGsh6mzPOviW1P6hkQ9eKDsSshEGjQ1qrKg/Y BhGHzRYmeaplotAMF1w22iqqzYKqFrqI1QSJLMuQ9lvFqAF7BY8nN3UKNzWtDqYoZ9bJ M16Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=56Iqjr9yycYmKZKdaRMZjRiJDEWG4/hcty7cgcon2Iw=; b=iikbkVX4RPhFTC1OJjBTJxvY8QWmm3NucgLbRTjOP0oK8OXGndPlMl/KsxxgcFeUfo io1S02GMG7LuY5HT34WUudMtvpllXDNafEKsd97FzOP/+HdolkHKHimgr3ZhTclaXhlc cglnPZqr/aoeZ7x2Dph7j5+itIbvDkgAtUJ5dUPzytYG/1FQkn5aUFDWds0JmegYejA6 p5/eFnaGeOpA9bMmhCvmvt/B3jIixaxW6rj7JqyyCD0jVSNkHmjLgSTuA10vIb9gcQAH njyVt4wX0m1m4jwiKkQ9ZOn5TvuIOyWTiHlfgw+m9/Z6LJUA4PjKjy+spT5saq2kbn3J 9SyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CEM9Knve; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d26si20449114ejc.620.2021.07.19.08.11.59; Mon, 19 Jul 2021 08:11:59 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CEM9Knve; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242835AbhGSObB (ORCPT + 12 others); Mon, 19 Jul 2021 10:31:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:38648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244463AbhGSO3q (ORCPT ); Mon, 19 Jul 2021 10:29:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 84ECD6120D; Mon, 19 Jul 2021 15:09:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707378; bh=QA02mMdXZSWl0ubKkp4Oiy6y8Z2qmOYBGuEpv++eWQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CEM9KnveEYiavhul/Z2HP3KSlFqsAQnYetTa8t0xyyeMKhraYd2eKPISnjr5cJrpz AkXCalTRULIfTtlxIwbpm10jjWHOne4LdMZiWDRcimeuJjkflamVKrGaPFld6wKNh6 XzGgcwFJ2g5VeRQMJF8UtwkC2JKwwPBSnzF3Zbhk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.9 105/245] iio: light: tcs3414: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:50:47 +0200 Message-Id: <20210719144943.813630370@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.288257948@linuxfoundation.org> References: <20210719144940.288257948@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron [ Upstream commit ff08fbc22ab32ccc6690c21b0e5e1d402dcc076f ] To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned. Found during an audit of all calls of uses of iio_push_to_buffers_with_timestamp() Fixes: a244e7b57f0f ("iio: Add driver for AMS/TAOS tcs3414 digital color sensor") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-19-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/light/tcs3414.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c index a795afb7667b..b51cd43ef824 100644 --- a/drivers/iio/light/tcs3414.c +++ b/drivers/iio/light/tcs3414.c @@ -56,7 +56,11 @@ struct tcs3414_data { u8 control; u8 gain; u8 timing; - u16 buffer[8]; /* 4x 16-bit + 8 bytes timestamp */ + /* Ensure timestamp is naturally aligned */ + struct { + u16 chans[4]; + s64 timestamp __aligned(8); + } scan; }; #define TCS3414_CHANNEL(_color, _si, _addr) { \ @@ -212,10 +216,10 @@ static irqreturn_t tcs3414_trigger_handler(int irq, void *p) if (ret < 0) goto done; - data->buffer[j++] = ret; + data->scan.chans[j++] = ret; } - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, iio_get_time_ns(indio_dev)); done: