From patchwork Mon Jul 12 06:10:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472904 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2660511jao; Sun, 11 Jul 2021 23:50:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGzMIOX3IyhcytaTz4EEFBnwSFbIjfQIB1yAZ5WqWr0fKxfOu4BVCCUQJbPSm5x7drMCi8 X-Received: by 2002:a50:d642:: with SMTP id c2mr7364708edj.22.1626072616934; Sun, 11 Jul 2021 23:50:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072616; cv=none; d=google.com; s=arc-20160816; b=WD5jg0P49V7Lt1idKoJ36xy1kt2Xidw7RDX6FO1a2RLEOYAdZFhg9uCdY1fmiqVmnC H8zpKLCfZJ8FQdrAruckjEhww4osAYDKlNhcDj9YLu9FJYduAvvD65+qCIzNya4V6eW6 zA1LuVSfY7DsEP+B+iAtuQnA6WprQjpNy+P8ON0knMjMJssD5npVs/qAcLcUGvqvyB1J +mbpcRYexzzLxqH8shJVHV1mtK3y7FwUi7mmenTv+60aM3V5nu2VgkpF3lraLD9oitn9 RBNfjo/7PRBcq/Dt/cZVqRf+lUHa42latJr7oX1JSDqZkXT1NciUoillqVPDSRuy7Zl6 v8Kg== 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=ZHe3gYhgPgyJbUhDToDzAO7NojFsazKUHxUBLKLl6Ko=; b=Qj1gP2QY227gR1kJjnkUOSMrJALZrpJDzTX6YSA1+lmhdFsgYElJr/DKbLiFKK3/Nu NaEwWjazT0Yef2/e9lhb0IgYzwIXl718VPtPkUlvBQPi9Wytz+BwSdPDjwZzz2Ev72B/ g7HxCtueDv7FxJeX+fAsjJL86h/SSrL3TS0Q+/h9ltxK+DNRmFGVTQh5Wz+Lh9WkDpOu jq76hjE6yzI/9FqdGEoG0mcBeothr9W0/zlpXrX9KuiO9BMqEJFR9VMYeETKVmYfqw/y JmDeGkHqoy73x9B+UpXVadm9aihOQW4UgkO76uu7OPxsHfJqSijneqyMOlwZlVX8qgu6 +mlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DdvPEGLC; 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 r25si3440466edp.437.2021.07.11.23.50.16; Sun, 11 Jul 2021 23:50:16 -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=DdvPEGLC; 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 S238217AbhGLGwW (ORCPT + 12 others); Mon, 12 Jul 2021 02:52:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:48262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239050AbhGLGt2 (ORCPT ); Mon, 12 Jul 2021 02:49:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CDC576115C; Mon, 12 Jul 2021 06:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072354; bh=q0kgSQ+nvfk1kPn0gHqgc8Mtyw07CI6RK73Q2udLmDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DdvPEGLCCTXQsSOEsGiejavN7D8UDgXE6cm2V7UdvVMa600iVxVLbzpz8V5mkoK8K IBMSiPcN1He7cqq49QfnwtS56WBTjaGO5grIEuh/zPCu0cIy9tZtw7PuFxzKWiR69/ thGKYQlfR1pr1Kr0VXHwhEQfpgoj+Ad+ghjWnS+A= 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 5.10 461/593] iio: light: isl29125: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:21 +0200 Message-Id: <20210712060940.284462185@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@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 b93b85dbc3a6..ba53b50d711a 100644 --- a/drivers/iio/light/isl29125.c +++ b/drivers/iio/light/isl29125.c @@ -51,7 +51,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) { \ @@ -184,10 +188,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: