Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fe9da42 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

gpio: acpi: Synchronize acpi_find_gpio() and acpi_gpio_count() 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f10e4bf6

drivers/gpio/gpiolib-acpi.c

+3 −0
Original line number Diff line number Diff line
@@ -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);