From patchwork Mon Jul 12 06:10:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 472966 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2682806jao; Mon, 12 Jul 2021 00:23:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUQHiMC+8hJWwTn4v+L6IwL8lzf6v6U/q3jVdPAB1IgR1EJu4c0S1PclXG7/P5EtLlhQLo X-Received: by 2002:a17:906:74c1:: with SMTP id z1mr51395873ejl.466.1626074596407; Mon, 12 Jul 2021 00:23:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626074596; cv=none; d=google.com; s=arc-20160816; b=NhHMFrFDhHkqsfrqkkpPFijdSnayYxceIreNisbegQzBxpBvfi1AwR5nqQnwjHOHpF VBwRc1Ti2pT8QKyl3/SckQYqzstiaeW6A94V36jjR+WcPv13O+qp08Tq6IcHac4TmO0f 7lMrLQK+ZDhD9W80Ls1RiiEjTkyi0lxBN+4X240JwUKdld7adjo+O53hSNfo71botfhV Vg5EmWDIEoj0FC/9Xq5k97gI6ZhVGznqtOjL1lui1urVZ0jas+cxIBLzRJEPL2TURXnI taj5FVtq8l3M+N2MaegsafuWN6Wft5rIeikhqG3XIowMC7knsIaPvtaS/ah8li4U5p6q KTQg== 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=Gfkj/oF8u+yIEzjeMYraRmBfILycp8tUaRtbnG05qflti7z9i430U2R70hVW2CXysn t9r/GonJkbAqCf9eTkACjNE1HfbaQlX1agj3e4rkJlLiwciBI4F/Bmk8a024yRekB/VC PHY90pVCaXlhp+7w7crCYqkKCaGhH2t7wczhJSvdvhPgwW8EciEZP8FsmGFYLVSkAZOE /x/W3IABFmPnP14EgEODq/rbh52IrXypDBiPyw0l7INgW+1/37KJfGItnt5xUqmEv7hr Jl8MWAamSH7JGw6BOIVknutoYczSEOMRU+tADbywKgTb/XRNjjVTyMqBIpID11alQbg7 jPcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="n/qRzNiQ"; 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 d9si16909677edq.169.2021.07.12.00.23.16; Mon, 12 Jul 2021 00:23: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="n/qRzNiQ"; 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 S242959AbhGLHX3 (ORCPT + 12 others); Mon, 12 Jul 2021 03:23:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:59958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241324AbhGLHVt (ORCPT ); Mon, 12 Jul 2021 03:21:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9FBEB60FF1; Mon, 12 Jul 2021 07:18:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626074340; bh=q0kgSQ+nvfk1kPn0gHqgc8Mtyw07CI6RK73Q2udLmDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/qRzNiQi9AoYdq/z0mrMTLBejLkWEcY0ubWExFJ7zkzVRjmh0yKzYXsPy+/Gtsgj Je4OkS6Bsost4x2T6IoHDpP5DZTthzG/TRgZRXs4pBNihUy1PfnjGLsZDub+eVp7Gi JrTAJ2/PUbIGnrlsITMclyGTOgUq4foECiOnOamk= 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.12 548/700] iio: light: isl29125: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:31 +0200 Message-Id: <20210712061034.615065196@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@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: