summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-mvebu.c
diff options
context:
space:
mode:
authorBartosz Golaszewski <bgolaszewski@baylibre.com>2019-11-12 10:34:00 +0100
committerBartosz Golaszewski <bgolaszewski@baylibre.com>2019-11-12 10:34:00 +0100
commit5be85ec0de8425fb22c7b38fbaf4f245e41a5dca (patch)
tree4148d2f8aa56b75488fbd568048ac81fa786ae9a /drivers/gpio/gpio-mvebu.c
parent1720624ee47369d6221dde477a883ddf57379531 (diff)
parent6b240aeb121ec14a528a58413baa9a74f8749604 (diff)
Merge remote-tracking branch 'linusw/for-next' into gpio/for-next
Diffstat (limited to 'drivers/gpio/gpio-mvebu.c')
-rw-r--r--drivers/gpio/gpio-mvebu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index 6c0687694341..9b2adf0ef880 100644
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -384,7 +384,10 @@ static int mvebu_gpio_get_direction(struct gpio_chip *chip, unsigned int pin)
regmap_read(mvchip->regs, GPIO_IO_CONF_OFF + mvchip->offset, &u);
- return !!(u & BIT(pin));
+ if (u & BIT(pin))
+ return GPIO_LINE_DIRECTION_IN;
+
+ return GPIO_LINE_DIRECTION_OUT;
}
static int mvebu_gpio_to_irq(struct gpio_chip *chip, unsigned int pin)