From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
linux-gpio@vger.kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Hans de Goede <hdegoede@redhat.com>,
linux-kernel@vger.kernel.org,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>,
linux-acpi@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 5/8] gpio: acpi: Synchronize acpi_find_gpio() and acpi_gpio_count()
Date: Thu, 23 Mar 2017 21:46:15 +0200 [thread overview]
Message-ID: <20170323194618.26548-6-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20170323194618.26548-1-andriy.shevchenko@linux.intel.com>
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 resourses 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>
---
drivers/gpio/gpiolib-acpi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index e516b7a0cc50..61518273e360 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -1111,6 +1111,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);
--
2.11.0
next prev parent reply other threads:[~2017-03-23 19:46 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-23 19:46 [PATCH v1 0/8] gpio: acpi: Make it working Andy Shevchenko
2017-03-23 19:46 ` [PATCH v1 1/8] gpiolib: Export gpiod_configure_flags() to internal users Andy Shevchenko
2017-03-23 19:46 ` [PATCH v1 2/8] gpio: acpi: Align acpi_find_gpio() with DT version Andy Shevchenko
2017-03-23 20:13 ` Dmitry Torokhov
2017-03-23 19:46 ` [PATCH v1 3/8] gpio: acpi: Do sanity check for GpioInt in acpi_find_gpio() Andy Shevchenko
2017-03-23 20:19 ` Dmitry Torokhov
2017-03-23 19:46 ` [PATCH v1 4/8] gpio: acpi: Even more tighten up ACPI GPIO lookups Andy Shevchenko
2017-03-23 20:12 ` Dmitry Torokhov
2017-03-24 10:46 ` Bastien Nocera
2017-03-28 16:31 ` Andy Shevchenko
2017-03-29 7:04 ` Dmitry Torokhov
2017-03-23 19:46 ` Andy Shevchenko [this message]
2017-03-24 15:55 ` [PATCH v1 5/8] gpio: acpi: Synchronize acpi_find_gpio() and acpi_gpio_count() Mika Westerberg
2017-03-23 19:46 ` [PATCH v1 6/8] gpio: acpi: Explain how to get GPIO descriptors in ACPI case Andy Shevchenko
2017-03-23 20:28 ` Dmitry Torokhov
2017-03-28 16:39 ` Andy Shevchenko
2017-03-29 7:12 ` Dmitry Torokhov
2017-03-29 15:04 ` Andy Shevchenko
2017-04-04 16:11 ` Andy Shevchenko
2017-04-04 17:31 ` Dmitry Torokhov
2017-04-04 17:59 ` Andy Shevchenko
2017-04-04 18:21 ` Dmitry Torokhov
2017-03-23 19:46 ` [PATCH v1 7/8] gpio: acpi: Factor out acpi_gpio_to_gpiod_flags() helper Andy Shevchenko
2017-03-23 19:46 ` [PATCH v1 8/8] gpio: acpi: Override GPIO initialization flags Andy Shevchenko
2017-03-24 13:48 ` [PATCH v1 0/8] gpio: acpi: Make it working Jarkko Nikula
2017-03-24 16:01 ` Mika Westerberg
2017-03-28 13:24 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170323194618.26548-6-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=dmitry.torokhov@gmail.com \
--cc=gnurou@gmail.com \
--cc=hdegoede@redhat.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).