瀏覽代碼

gpiolib: Fix missing updates of bitmap index

In new code introduced by commit b17566a6b08b ("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>
Janusz Krzysztofik 6 年之前
父節點
當前提交
35ae7f9694
共有 1 個文件被更改,包括 6 次插入5 次删除
  1. 6 5
      drivers/gpio/gpiolib.c

+ 6 - 5
drivers/gpio/gpiolib.c

@@ -2880,8 +2880,8 @@ 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,
-						   array_size, i);
+				i = find_next_zero_bit(array_info->get_mask,
+						       array_size, i);
 			else
 			else
 				i++;
 				i++;
 		} while ((i < array_size) &&
 		} while ((i < array_size) &&
@@ -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,8 +3193,8 @@ 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,
-						   array_size, i);
+				i = find_next_zero_bit(array_info->set_mask,
+						       array_size, i);
 			else
 			else
 				i++;
 				i++;
 		} while ((i < array_size) &&
 		} while ((i < array_size) &&