openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpiolib: Fix missing updates of bitmap index 

In new code introduced by commit b17566a6b0 ("gpiolib: Implement fast
processing path in get/set array"), bitmap index is not updated with
next found zero bit position as it should while skipping over pins
already processed via fast bitmap path, possibly resulting in an
infinite loop.  Fix it.

Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Janusz Krzysztofik 2018-09-24 01:53:35 +02:00 committed by Linus Walleij
parent 212d706961
commit 35ae7f9694
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpio/gpiolib.c
View File

@ -2880,7 +2880,7 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep,
__set_bit(hwgpio, mask); __set_bit(hwgpio, mask);
if (array_info) if (array_info)
find_next_zero_bit(array_info->get_mask, i = find_next_zero_bit(array_info->get_mask,
array_size, i); array_size, i);
else else
i++; i++;
@ -2905,7 +2905,8 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep,
trace_gpio_value(desc_to_gpio(desc), 1, value); trace_gpio_value(desc_to_gpio(desc), 1, value);
if (array_info) if (array_info)
find_next_zero_bit(array_info->get_mask, i, j); j = find_next_zero_bit(array_info->get_mask, i,
j);
else else
j++; j++;
} }
@ -3192,7 +3193,7 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,
} }
if (array_info) if (array_info)
find_next_zero_bit(array_info->set_mask, i = find_next_zero_bit(array_info->set_mask,
array_size, i); array_size, i);
else else
i++; i++;