Message ID | 20170523170327.18055-6-andriy.shevchenko@linux.intel.com |
---|---|
State | New |
Headers | show |
On Tue, May 23, 2017 at 7:03 PM, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > If we pass connection ID to the both functions and at the same time > acpi_can_fallback_to_crs() returns false we will get different results, > i.e. the number of GPIO resources returned by acpi_gpio_count() might be > not correct. > > Fix this by calling acpi_can_fallback_to_crs() in acpi_gpio_count() > before trying to fallback. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> > Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Patch applied. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 0392d8ed332f..740df0e9dcb3 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -1119,6 +1119,9 @@ int acpi_gpio_count(struct device *dev, const char *con_id) struct list_head resource_list; unsigned int crs_count = 0; + if (!acpi_can_fallback_to_crs(adev, con_id)) + return count; + INIT_LIST_HEAD(&resource_list); acpi_dev_get_resources(adev, &resource_list, acpi_find_gpio_count, &crs_count);