Check that we don't ask for output direction on GpioInt resource in cases with
or without _DSD defined.

Signed-off-by: Andy Shevchenko <[email protected]>
---
 drivers/gpio/gpiolib-acpi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 3bda3166d418..21e4930ca2db 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -614,12 +614,12 @@ struct gpio_desc *acpi_find_gpio(struct device *dev,
                desc = acpi_get_gpiod_by_index(adev, NULL, idx, &info);
                if (IS_ERR(desc))
                        return desc;
+       }
 
-               if ((flags == GPIOD_OUT_LOW || flags == GPIOD_OUT_HIGH) &&
-                   info.gpioint) {
-                       dev_dbg(dev, "refusing GpioInt() entry when doing 
GPIOD_OUT_* lookup\n");
-                       return ERR_PTR(-ENOENT);
-               }
+       if (info.gpioint &&
+           (flags == GPIOD_OUT_LOW || flags == GPIOD_OUT_HIGH)) {
+               dev_dbg(dev, "refusing GpioInt() entry when doing GPIOD_OUT_* 
lookup\n");
+               return ERR_PTR(-ENOENT);
        }
 
        if (info.polarity == GPIO_ACTIVE_LOW)
-- 
2.11.0

Reply via email to