diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2019-04-08 13:03:09 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-04-08 13:03:09 +0200 |
| commit | 26af34079f1d8299932303cfd2b376b9cf55a35c (patch) | |
| tree | f1a9824855fae569aa51c2109a5929715143093d /drivers/gpio/gpiolib.c | |
| parent | gpio: mmio: Drop bgpio_dir_inverted (diff) | |
| parent | Linux 5.1-rc3 (diff) | |
| download | linux-dev-26af34079f1d8299932303cfd2b376b9cf55a35c.tar.xz linux-dev-26af34079f1d8299932303cfd2b376b9cf55a35c.zip | |
Merge tag 'v5.1-rc3' into devel
Linux 5.1-rc3
Diffstat (limited to 'drivers/gpio/gpiolib.c')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index e5c3c4bff6fe..cb0ffe7fb27e 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2788,7 +2788,7 @@ int gpiod_set_debounce(struct gpio_desc *desc, unsigned debounce) } config = pinconf_to_config_packed(PIN_CONFIG_INPUT_DEBOUNCE, debounce); - return gpio_set_config(chip, gpio_chip_hwgpio(desc), config); + return chip->set_config(chip, gpio_chip_hwgpio(desc), config); } EXPORT_SYMBOL_GPL(gpiod_set_debounce); @@ -2825,7 +2825,7 @@ int gpiod_set_transitory(struct gpio_desc *desc, bool transitory) packed = pinconf_to_config_packed(PIN_CONFIG_PERSIST_STATE, !transitory); gpio = gpio_chip_hwgpio(desc); - rc = gpio_set_config(chip, gpio, packed); + rc = chip->set_config(chip, gpio, packed); if (rc == -ENOTSUPP) { dev_dbg(&desc->gdev->dev, "Persistence not supported for GPIO %d\n", gpio); |