diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-24 20:01:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-24 20:01:43 -0500 |
| commit | b1bf78bfb2e4c9ffa03ccdbc60d89a2f7c5fd82c (patch) | |
| tree | fcd93c3f54a72ca6a6ee97f015efebe6d80a3271 /drivers/gpio/gpio-pxa.c | |
| parent | aea0a897af9e44c258e8ab9296fad417f1bc063a (diff) | |
| parent | d146194f31c96f9b260c5a1cf1592d2e7f82a2e2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/gpio/gpio-pxa.c')
| -rw-r--r-- | drivers/gpio/gpio-pxa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index bfe4c5c9f41c..e9600b556f39 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c | |||
| @@ -268,8 +268,8 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | |||
| 268 | 268 | ||
| 269 | if (pxa_gpio_has_pinctrl()) { | 269 | if (pxa_gpio_has_pinctrl()) { |
| 270 | ret = pinctrl_gpio_direction_input(chip->base + offset); | 270 | ret = pinctrl_gpio_direction_input(chip->base + offset); |
| 271 | if (!ret) | 271 | if (ret) |
| 272 | return 0; | 272 | return ret; |
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | spin_lock_irqsave(&gpio_lock, flags); | 275 | spin_lock_irqsave(&gpio_lock, flags); |