From patchwork Mon Jul 19 14:50:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479877 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4218048jao; Mon, 19 Jul 2021 08:12:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqKoKm7eeBHZgXA4+S8tCDdUjzupCIw9Tj8mhGyTYh9xFpqQncfWOJAjkMM9DY1EQpW7vl X-Received: by 2002:a17:906:2752:: with SMTP id a18mr28850289ejd.458.1626707557552; Mon, 19 Jul 2021 08:12:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707557; cv=none; d=google.com; s=arc-20160816; b=pqjcz1HI4iiR23gCG6WYbWxk5oIquCkUyXiGh4wOq3MEY/9nz+Jhii5YP7NY9thfIT niCYP+3hhg3/7vmb6RWF2EeyJnsVql6bwwotap4vQix2JcgjK6eIbKy/Q0f3hCIsn48p iuuK2pXHJzHX0P46odPYyMCL3/QnkHHXSjpHMygnGNMe1f44HeDLla/Q9An9/9WC0GzE BMi/c8jtCWutxfnIb3tOiRtgWYlrj+51KNjOeHWWNp7tEmQxb1jPNXt85n87aDwhlp7G QwgGPmocVCOaVV8J6gBfapd0k1y19Qb0DN1uREz8lMDSwxvNNH+7vqvdJRFn8geWsfR/ OhFQ== 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=Lkb5J/m5ycC9Wg/hKXJpURF7B1iN1tkdCY1lV0rAvmY=; b=WzVkOO7J1DcgGWsnP3hRV6VWpXUk0YfIO80Sx43LB+Po2ZCZPHx1KNVSNgi3fEw31g EajCTPpjFT10SK9WKjWPjNtosAelivAzB3+wmuDkDFctGr9/JkMCKIQpGmCYa41onUoI NOsKxCqAq76J03vPx+/RZ9+PrCa2W5frgWpwwd7P28oBUcen0HOH5gFx3rZcKasTEmkA vNcO7bDECms4YOHNcqeZrVdqzMN/csCAiYQlzacxhetahQydpHLT4UcH6MF/tF6oEfTi XNL79GRwdXawKPtj2o86AuLZ/jJCgokGpPXG8IbH5wAqJarfH/3g7aXZnq6ncnthlaXe anVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1guheZLx; 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.12.37; Mon, 19 Jul 2021 08:12:37 -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=1guheZLx; 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 S245254AbhGSObf (ORCPT + 12 others); Mon, 19 Jul 2021 10:31:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:40508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244437AbhGSO3q (ORCPT ); Mon, 19 Jul 2021 10:29:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 55D1F6113E; Mon, 19 Jul 2021 15:09:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707375; bh=xZofZf6Zv1XFkByyxAtrDNXrtsrmbvjOyMpOqXaMx64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1guheZLxavvLIIIQCq+sjzyGSHorW7KZC72EwJ7PfbLc8feO6fWAVQJUsRfYDnAfr GZYlsVLVpVazAtOQn79j0IGfpOeHq+zvjokUq3vcTfuaVdyuNQwBdNx2xPdGA2G60E OHBtfegtKybrZHRSD6dzp/68grK29W44iDbBc8yU= 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 104/245] iio: light: isl29125: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:50:46 +0200 Message-Id: <20210719144943.782857616@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 3d4725194de6935dba2ad7c9cc075c885008f747 ] 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: 6c25539cbc46 ("iio: Add Intersil isl29125 digital color light sensor driver") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-18-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/light/isl29125.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/light/isl29125.c b/drivers/iio/light/isl29125.c index 1d2c0c8a1d4f..207b856cef8c 100644 --- a/drivers/iio/light/isl29125.c +++ b/drivers/iio/light/isl29125.c @@ -54,7 +54,11 @@ struct isl29125_data { struct i2c_client *client; u8 conf1; - u16 buffer[8]; /* 3x 16-bit, padding, 8 bytes timestamp */ + /* Ensure timestamp is naturally aligned */ + struct { + u16 chans[3]; + s64 timestamp __aligned(8); + } scan; }; #define ISL29125_CHANNEL(_color, _si) { \ @@ -187,10 +191,10 @@ static irqreturn_t isl29125_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: