summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpiolib.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2017-11-30 10:55:55 +0100
committerLinus Walleij <linus.walleij@linaro.org>2017-11-30 10:55:55 +0100
commit35541874e6dbde376c68adc686fd6a7df4095e58 (patch)
tree5a3b8a7373ed6a6514862f1c57fc89312b99bb3c /drivers/gpio/gpiolib.c
parentgpio: omap: initialize gpioirq chip as part of gpiochip_add_data (diff)
parentgpiolib: acpi: Introduce NO_RESTRICTION quirk (diff)
downloadlinux-35541874e6dbde376c68adc686fd6a7df4095e58.tar.xz
linux-35541874e6dbde376c68adc686fd6a7df4095e58.zip
Merge branch 'ib-gpio-acpi-quirks' into devel
Diffstat (limited to 'drivers/gpio/gpiolib.c')
-rw-r--r--drivers/gpio/gpiolib.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index bdcdcdefdb71..ec0fd95bbf35 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -3690,9 +3690,7 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
desc = acpi_node_get_gpiod(fwnode, propname, index, &info);
if (!IS_ERR(desc)) {
active_low = info.polarity == GPIO_ACTIVE_LOW;
- ret = acpi_gpio_update_gpiod_flags(&dflags, info.flags);
- if (ret)
- pr_debug("Override GPIO initialization flags\n");
+ acpi_gpio_update_gpiod_flags(&dflags, &info);
}
}