diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-11 11:45:30 -0800 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-12-13 17:36:02 +0100 |
| commit | 10cf4899f8affa468b9140f377857bfe3f563012 (patch) | |
| tree | 4330bab7ac37927291d85871798e7b18d4271ac7 /drivers/gpio/gpiolib.c | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
| download | blackbird-op-linux-10cf4899f8affa468b9140f377857bfe3f563012.tar.gz blackbird-op-linux-10cf4899f8affa468b9140f377857bfe3f563012.zip | |
gpiolib: tighten up ACPI legacy gpio lookups
We should not fall back to the legacy unnamed gpio lookup style if the
driver requests gpios with different names, because we'll give out the same
gpio twice. Let's keep track of the names that were used for the device and
only do the fallback for the first name used.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpiolib.c')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index a18f00fc1bb8..3ca6c9f4391e 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1868,6 +1868,9 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id, /* Then from plain _CRS GPIOs */ if (IS_ERR(desc)) { + if (!acpi_can_fallback_to_crs(adev, con_id)) + return ERR_PTR(-ENOENT); + desc = acpi_get_gpiod_by_index(adev, NULL, idx, &info); if (IS_ERR(desc)) return desc; |
