From mboxrd@z Thu Jan 1 00:00:00 1970 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 29D4F255247 for ; Mon, 12 May 2025 10:20:46 +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=1747045247; cv=none; b=UJIF2njIpHFPwYhCzuj/Grq5vEbQa6mzfvZkCVTvBcgD/YWbGxCV5GDzO/cGWHZsDFewHez6nBt+AuiUqgtL+dOEjlIB73yJApUV9FoVq9UxWlQGwx9DhFdE7/8mBR+Ih0+DTyevlycM6Y3mPsuy6SdfJjjJgQnc7FOgfd45dLo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747045247; c=relaxed/simple; bh=+kTJ1fWG3x+l/FEiDwwrdWX6wVRy1tIU6zDzQAMGn7k=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=B+EzVdIxT11BkLimfU+XEyuYUo92HKid2ls6EPkDWsiStLXs1CjERIqDTLrD7pogWCyfz44MQP1cNUw7JZPE3j/pnnPOYbDMI+cuuuPfGLd21pIER52J4GllxKoG/Q/nAXV+t3VzDRDQc7OfsnKf3QZ01G9oTqXyUNF03H0PwkY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=js2l8NU/; 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="js2l8NU/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26055C4CEE7; Mon, 12 May 2025 10:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747045246; bh=+kTJ1fWG3x+l/FEiDwwrdWX6wVRy1tIU6zDzQAMGn7k=; h=Subject:To:Cc:From:Date:From; b=js2l8NU/gTms40PKAD6MBC7gk6uMKkEjMYGE980ZkkDHW5RZj0ebW+AvpoyNEBZN+ cFF32O69ugohDdeICjp/CzCIVZQ3NWcaYHZmiBMYe3wpZDSbINFrqHMhKR9NoCGBE1 q71hw3CuO5jnbkZXFWwnMfIlONY3mnI3TchJZF9s= Subject: FAILED: patch "[PATCH] iio: hid-sensor-prox: Restore lost scale assignments" failed to apply to 6.1-stable tree To: lixu.zhang@intel.com,Jonathan.Cameron@huawei.com,srinivas.pandruvada@linux.intel.com Cc: From: Date: Mon, 12 May 2025 12:20:30 +0200 Message-ID: <2025051230-facility-envision-71f1@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.1-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.1.y git checkout FETCH_HEAD git cherry-pick -x 83ded7cfaccccd2f4041769c313b58b4c9e265ad # git commit -s git send-email --to '' --in-reply-to '2025051230-facility-envision-71f1@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 83ded7cfaccccd2f4041769c313b58b4c9e265ad Mon Sep 17 00:00:00 2001 From: Zhang Lixu Date: Mon, 31 Mar 2025 13:50:20 +0800 Subject: [PATCH] iio: hid-sensor-prox: Restore lost scale assignments The variables `scale_pre_decml`, `scale_post_decml`, and `scale_precision` were assigned in commit d68c592e02f6 ("iio: hid-sensor-prox: Fix scale not correct issue"), but due to a merge conflict in commit 9c15db92a8e5 ("Merge tag 'iio-for-5.13a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next"), these assignments were lost. Add back lost assignments and replace `st->prox_attr` with `st->prox_attr[0]` because commit 596ef5cf654b ("iio: hid-sensor-prox: Add support for more channels") changed `prox_attr` to an array. Cc: stable@vger.kernel.org # 5.13+ Fixes: 9c15db92a8e5 ("Merge tag 'iio-for-5.13a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next") Signed-off-by: Zhang Lixu Acked-by: Srinivas Pandruvada Link: https://patch.msgid.link/20250331055022.1149736-2-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 76b76d12b388..1dc6fb7cf614 100644 --- a/drivers/iio/light/hid-sensor-prox.c +++ b/drivers/iio/light/hid-sensor-prox.c @@ -257,6 +257,11 @@ static int prox_parse_report(struct platform_device *pdev, st->num_channels = index; + st->scale_precision = hid_sensor_format_scale(hsdev->usage, + &st->prox_attr[0], + &st->scale_pre_decml, + &st->scale_post_decml); + return 0; }