]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
gpio: virtuser: fix handling of multiple conn_ids in lookup table
authorKoichiro Den <koichiro.den@canonical.com>
Fri, 3 Jan 2025 14:18:27 +0000 (23:18 +0900)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Fri, 3 Jan 2025 16:15:03 +0000 (17:15 +0100)
Creating a virtuser device via configfs with multiple conn_ids fails due
to incorrect indexing of lookup entries. Correct the indexing logic to
ensure proper functionality when multiple gpio_virtuser_lookup are
created.

Fixes: 91581c4b3f29 ("gpio: virtuser: new virtual testing driver for the GPIO API")
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Link: https://lore.kernel.org/r/20250103141829.430662-3-koichiro.den@canonical.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-virtuser.c

index e89b1239b635f83f1268058a6d1cf2f21bceb553..d6244f0d3bc75221a1ea4361a783243855e3dbb2 100644 (file)
@@ -1410,7 +1410,7 @@ gpio_virtuser_make_lookup_table(struct gpio_virtuser_device *dev)
        size_t num_entries = gpio_virtuser_get_lookup_count(dev);
        struct gpio_virtuser_lookup_entry *entry;
        struct gpio_virtuser_lookup *lookup;
-       unsigned int i = 0;
+       unsigned int i = 0, idx;
 
        lockdep_assert_held(&dev->lock);
 
@@ -1424,12 +1424,12 @@ gpio_virtuser_make_lookup_table(struct gpio_virtuser_device *dev)
                return -ENOMEM;
 
        list_for_each_entry(lookup, &dev->lookup_list, siblings) {
+               idx = 0;
                list_for_each_entry(entry, &lookup->entry_list, siblings) {
-                       table->table[i] =
+                       table->table[i++] =
                                GPIO_LOOKUP_IDX(entry->key,
                                                entry->offset < 0 ? U16_MAX : entry->offset,
-                                               lookup->con_id, i, entry->flags);
-                       i++;
+                                               lookup->con_id, idx++, entry->flags);
                }
        }