From patchwork Mon Jul 19 14:49:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479946 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4241582jao; Mon, 19 Jul 2021 08:39:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhCgb7Dinq+m+MLfaFQZjvOM1bhx7q5cGXWlYwCub/Fqsq8foFD2qa7KyOUkLdSAq2j3T7 X-Received: by 2002:a02:6d5d:: with SMTP id e29mr3655307jaf.44.1626709176326; Mon, 19 Jul 2021 08:39:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709176; cv=none; d=google.com; s=arc-20160816; b=l2F7rGUT9xVPUDMlUoBgxEIwmLQOINVpcv50xXSbIX0Sb/i46hfPh8o6VALSd4Mt0+ XXGBg6+yuHJ1AqHUWg1Btf0R9WB4qauflWnBog5YtmN7gwSA7UMxxrRY0NshSrJbLUIR OL9ci0kjSo6zpw4XmCFWfMiZD4Sdbs3+3rSKy/nLqrmEWVxhdue97DNrrwceSCeCwv/I wb9J7UZi4zgzo/90BqfGegeXVVC9ddNmXjp8mL8BucmhuYx5k0cN9HwAQMC4kOHB4yy8 J34j2FJ5pLYielvSImB09J/Yad9PF1gIE9E57x50EEWKPJIfcOYMpRuebyPokhqRV6XJ jMgQ== 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=AdIIqNewBt8Suc3RsT2FEMnazkEteWWvf0VwpytXfT4=; b=VIJBNDKLem2AOAyo84r9Tn8hnpovKjfViq9Eb2G8/V4//y8v5CltLDeVHhNenl14kz /aYX4n5tp7qiGpOgMZgtTD7TIpLyQqbGqDuyI3PNLY2v/FfJHgcuDjRMAF7NKytGCxCn WtyOVXU1MqWQV4I7ulpSAMBw8LNom461o/k5XBXB608Kez2uN2jzUTZCsExagejAn5h3 W6yTvcFuQlbCTfVU+qCJIqStMJGwPuS5NULtz6mZjaJRqHeiM3HW4dz24nqjwslFZPRM qLx3uKJbL6r2vh/fUqCmG9j0605+ssSj/kk6cKloHprppEopusSzl2OrTZCQ4/Xy4Ba+ 1Uiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Yc0P3jZd; 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 x7si9611598iol.77.2021.07.19.08.39.36; Mon, 19 Jul 2021 08:39:36 -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=Yc0P3jZd; 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 S232313AbhGSO6z (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:53314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237756AbhGSO57 (ORCPT ); Mon, 19 Jul 2021 10:57:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7A6A36120C; Mon, 19 Jul 2021 15:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708935; bh=KIctiX+qkkb2JGot/CjdDUu0zcaztywjIL1hxxdO7nQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yc0P3jZdoWE/e8moGMIzqH0hHRRZ3c5A05rs0+JdEZleuOyXfv+lFNSB9mAIZpfSB gHzcdcgk+ZGQKFLd72YkJtIz+K8uWKPo0dbrX7gEk3X2f6jsWZkavH5eZj+0NvbrWz bJve63onUtgsP7/YtBj1r13tT9A6NuHSeyUHrOHI= 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.19 181/421] iio: light: isl29125: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:52 +0200 Message-Id: <20210719144952.706487225@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 ed38edcd5efe..d0f5fd42c0ec 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: