Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AB9F78C91 for ; Mon, 12 May 2025 10:04:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747044268; cv=none; b=El5NtfeTpkVqbB9m2E0GbfB3Itw1AmSelVKk0/F5SpD4z4l/n8sqTwVkZNmSGcvo8nQeR5AggoAuvPIkjgMewnP92n5G4oHlgABWE46NPlsqLGNc+4yF4iKQmjJWyDnqRtk5UlS1CykzoyyFu6ZU9a0Kfu6Xwe3JIMjSi0VxmDc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747044268; c=relaxed/simple; bh=UDRpbEzbLJTIS63YJs3N5V4p+S00OH0wPUhgRpzoN2c=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=qd9Ks6AC+wRozmTRmy7jseVxDO1Fb6MlT7cEIfRgHlQx/y+7c1/k7UrKbPwum3lJTzF+2TfKgaQCqxIJwAbI5ZH+2a3qXpt+aqWYRg6Dr3YWhnO48wuYWZHHILDEwq7If0CJ7+bodMRA9c+uaBnK9jnmgM5C0G/97Tyq7x8hzQA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BPCjGLhs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BPCjGLhs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7114DC4CEED; Mon, 12 May 2025 10:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747044267; bh=UDRpbEzbLJTIS63YJs3N5V4p+S00OH0wPUhgRpzoN2c=; h=Subject:To:Cc:From:Date:From; b=BPCjGLhskDV6uFnbA0bZ3+dlDsQf3UVYnR1rqDm5AzXrY6yngfJh/YZEakPNny6bs 0ac+6IunnpecormtfAoaHucAbJQ+CDpIkJ+QFXK9B9HcjHtvh8bESNs2s5VeDz0Lzr tLAPPw18ZP/+3YEYWwcdv0nX/H767GigaVGKKFxE= Subject: FAILED: patch "[PATCH] iio: hid-sensor-prox: Fix incorrect OFFSET calculation" failed to apply to 6.6-stable tree To: lixu.zhang@intel.com,Jonathan.Cameron@huawei.com,srinivas.pandruvada@linux.intel.com Cc: From: Date: Mon, 12 May 2025 12:04:16 +0200 Message-ID: <2025051216-banister-canned-57e2@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 79dabbd505210e41c88060806c92c052496dd61c # git commit -s git send-email --to '' --in-reply-to '2025051216-banister-canned-57e2@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 79dabbd505210e41c88060806c92c052496dd61c Mon Sep 17 00:00:00 2001 From: Zhang Lixu Date: Mon, 31 Mar 2025 13:50:22 +0800 Subject: [PATCH] iio: hid-sensor-prox: Fix incorrect OFFSET calculation The OFFSET calculation in the prox_read_raw() was incorrectly using the unit exponent, which is intended for SCALE calculations. Remove the incorrect OFFSET calculation and set it to a fixed value of 0. Cc: stable@vger.kernel.org Fixes: 39a3a0138f61 ("iio: hid-sensors: Added Proximity Sensor Driver") Signed-off-by: Zhang Lixu Acked-by: Srinivas Pandruvada Link: https://patch.msgid.link/20250331055022.1149736-4-lixu.zhang@intel.com Signed-off-by: Jonathan Cameron diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c index 941508e58286..4c65b32d34ce 100644 --- a/drivers/iio/light/hid-sensor-prox.c +++ b/drivers/iio/light/hid-sensor-prox.c @@ -124,8 +124,7 @@ static int prox_read_raw(struct iio_dev *indio_dev, ret_type = prox_state->scale_precision[chan->scan_index]; break; case IIO_CHAN_INFO_OFFSET: - *val = hid_sensor_convert_exponent( - prox_state->prox_attr[chan->scan_index].unit_expo); + *val = 0; ret_type = IIO_VAL_INT; break; case IIO_CHAN_INFO_SAMP_FREQ: