Patch "iio: adc: stm32-adc: fix channel sampling time init" has been added to the 6.0-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    iio: adc: stm32-adc: fix channel sampling time init

to the 6.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     iio-adc-stm32-adc-fix-channel-sampling-time-init.patch
and it can be found in the queue-6.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 34b45703c294b6a5e7326d4e2e5f1c6f928bb1b9
Author: Olivier Moysan <olivier.moysan@xxxxxxxxxxx>
Date:   Wed Oct 12 16:21:58 2022 +0200

    iio: adc: stm32-adc: fix channel sampling time init
    
    [ Upstream commit 174dac5dc800e4e2e4552baf6340846a344d01a3 ]
    
    Fix channel init for ADC generic channel bindings.
    In generic channel initialization, stm32_adc_smpr_init() is called to
    initialize channel sampling time. The "st,min-sample-time-ns" property
    is an optional property. If it is not defined, stm32_adc_smpr_init() is
    currently skipped.
    However stm32_adc_smpr_init() must always be called, to force a minimum
    sampling time for the internal channels, as the minimum sampling time is
    known. Make stm32_adc_smpr_init() call unconditional.
    
    Fixes: 796e5d0b1e9b ("iio: adc: stm32-adc: use generic binding for sample-time")
    Signed-off-by: Olivier Moysan <olivier.moysan@xxxxxxxxxxx>
    Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
    Reviewed-by: Fabrice Gasnier <fabrice.gasnier@xxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20221012142205.13041-2-olivier.moysan@xxxxxxxxxxx
    Cc: <Stable@xxxxxxxxxxxxxxx>
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index 130e8dd6f0c8..7719f7f93c3f 100644
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -2064,18 +2064,19 @@ static int stm32_adc_generic_chan_init(struct iio_dev *indio_dev,
 		stm32_adc_chan_init_one(indio_dev, &channels[scan_index], val,
 					vin[1], scan_index, differential);
 
+		val = 0;
 		ret = of_property_read_u32(child, "st,min-sample-time-ns", &val);
 		/* st,min-sample-time-ns is optional */
-		if (!ret) {
-			stm32_adc_smpr_init(adc, channels[scan_index].channel, val);
-			if (differential)
-				stm32_adc_smpr_init(adc, vin[1], val);
-		} else if (ret != -EINVAL) {
+		if (ret && ret != -EINVAL) {
 			dev_err(&indio_dev->dev, "Invalid st,min-sample-time-ns property %d\n",
 				ret);
 			goto err;
 		}
 
+		stm32_adc_smpr_init(adc, channels[scan_index].channel, val);
+		if (differential)
+			stm32_adc_smpr_init(adc, vin[1], val);
+
 		scan_index++;
 	}