Merge branch 'ib-gpio-acpi-quirks' into devel

This commit is contained in:
Linus Walleij
2017-11-30 10:55:55 +01:00
4 changed files with 50 additions and 24 deletions

View File

@@ -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);
}
}