The patch below does not apply to the 5.4-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 <stable@xxxxxxxxxxxxxxx>. 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-5.4.y git checkout FETCH_HEAD git cherry-pick -x 00f4bc5184c19cb33f468f1ea409d70d19f8f502 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023041103-squeegee-calcium-abaa@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 00f4bc5184c1 ("counter: 104-quad-8: Fix Synapse action reported for Index signals") aaec1a0f76ec ("counter: Internalize sysfs interface code") ea434ff82649 ("counter: stm32-timer-cnt: Provide defines for slave mode selection") 05593a3fd103 ("counter: stm32-lptimer-cnt: Provide defines for clock polarities") 394a0150a064 ("counter: Rename counter_count_function to counter_function") 493b938a14ed ("counter: Rename counter_signal_value to counter_signal_level") b11eed1554e8 ("counter: Return error code on invalid modes") 728246e8f726 ("counter: 104-quad-8: Return error when invalid mode during ceiling_write") d0ce3d5cf77d ("counter: stm32-timer-cnt: Add const qualifier for actions_list array") f83e6e59366b ("counter: stm32-lptimer-cnt: Add const qualifier for actions_list array") 0056a405c7ad ("counter: microchip-tcb-capture: Add const qualifier for actions_list array") 9b2574f61c49 ("counter: ftm-quaddec: Add const qualifier for actions_list array") 6a9eb0e31044 ("counter: 104-quad-8: Add const qualifier for actions_list array") 45af9ae84c60 ("counter: stm32-timer-cnt: Add const qualifier for functions_list array") 8a00fed665ad ("counter: stm32-lptimer-cnt: Add const qualifier for functions_list array") 7e0dcfcefeca ("counter: microchip-tcb-capture: Add const qualifier for functions_list array") 891b58b35fd6 ("counter: interrupt-cnt: Add const qualifier for functions_list array") fca2534fddfa ("counter: 104-quad-8: Add const qualifier for functions_list array") b711f687a1c1 ("counter: Add support for Intel Quadrature Encoder Peripheral") 9c15db92a8e5 ("Merge tag 'iio-for-5.13a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 00f4bc5184c19cb33f468f1ea409d70d19f8f502 Mon Sep 17 00:00:00 2001 From: William Breathitt Gray <william.gray@xxxxxxxxxx> Date: Thu, 16 Mar 2023 16:34:26 -0400 Subject: [PATCH] counter: 104-quad-8: Fix Synapse action reported for Index signals Signal 16 and higher represent the device's Index lines. The priv->preset_enable array holds the device configuration for these Index lines. The preset_enable configuration is active low on the device, so invert the conditional check in quad8_action_read() to properly handle the logical state of preset_enable. Fixes: f1d8a071d45b ("counter: 104-quad-8: Add Generic Counter interface support") Cc: <stable@xxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20230316203426.224745-1-william.gray@xxxxxxxxxx/ Signed-off-by: William Breathitt Gray <william.gray@xxxxxxxxxx> diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c index d59e4f34a680..d9cb937665cf 100644 --- a/drivers/counter/104-quad-8.c +++ b/drivers/counter/104-quad-8.c @@ -368,7 +368,7 @@ static int quad8_action_read(struct counter_device *counter, /* Handle Index signals */ if (synapse->signal->id >= 16) { - if (priv->preset_enable[count->id]) + if (!priv->preset_enable[count->id]) *action = COUNTER_SYNAPSE_ACTION_RISING_EDGE; else *action = COUNTER_SYNAPSE_ACTION_NONE;
