]> git.baikalelectronics.ru Git - kernel.git/commitdiff
iio: fix iio_format_avail_range() printing for none IIO_VAL_INT
authorFawzi Khaber <fawzi.khaber@tdk.com>
Mon, 18 Jul 2022 13:07:06 +0000 (15:07 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Tue, 19 Jul 2022 08:31:27 +0000 (09:31 +0100)
iio_format_avail_range() should print range as follow [min, step, max], so
the function was previously calling iio_format_list() with length = 3,
length variable refers to the array size of values not the number of
elements. In case of non IIO_VAL_INT values each element has integer part
and decimal part. With length = 3 this would cause premature end of loop
and result in printing only one element.

Signed-off-by: Fawzi Khaber <fawzi.khaber@tdk.com>
Signed-off-by: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@tdk.com>
Fixes: 58884cd94635 ("iio: core: Consolidate iio_format_avail_{list,range}()")
Link: https://lore.kernel.org/r/20220718130706.32571-1-jmaneyrol@invensense.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/industrialio-core.c

index 358b909298c0389fec6743fca6a59a0da8369072..0f4dbda3b9d3622d9c0677d0e9d8a95c5016c212 100644 (file)
@@ -812,7 +812,23 @@ static ssize_t iio_format_avail_list(char *buf, const int *vals,
 
 static ssize_t iio_format_avail_range(char *buf, const int *vals, int type)
 {
-       return iio_format_list(buf, vals, type, 3, "[", "]");
+       int length;
+
+       /*
+        * length refers to the array size , not the number of elements.
+        * The purpose is to print the range [min , step ,max] so length should
+        * be 3 in case of int, and 6 for other types.
+        */
+       switch (type) {
+       case IIO_VAL_INT:
+               length = 3;
+               break;
+       default:
+               length = 6;
+               break;
+       }
+
+       return iio_format_list(buf, vals, type, length, "[", "]");
 }
 
 static ssize_t iio_read_channel_info_avail(struct device *dev,