diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-04-03 22:18:36 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-03 22:18:36 +0200 |
| commit | 6a7b3e970426f4bc2a8d52f81a4fda6595a9f052 (patch) | |
| tree | 055765564c839e456fbe4c65c8cd2c4b00d731b7 /drivers/pinctrl/pinctrl-abx500.c | |
| parent | 661462f4c6d3c9ae0bac193c65936ebfac4c95b4 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
Merge tag 'v3.9-rc5' into devel
Linux 3.9-rc5
Conflicts:
drivers/pinctrl/pinconf.c
Diffstat (limited to 'drivers/pinctrl/pinctrl-abx500.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-abx500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c index e8abc3cf3033..0cf3fa4a21ae 100644 --- a/drivers/pinctrl/pinctrl-abx500.c +++ b/drivers/pinctrl/pinctrl-abx500.c @@ -422,7 +422,7 @@ static u8 abx500_get_mode(struct pinctrl_dev *pctldev, struct gpio_chip *chip, } /* check if pin use AlternateFunction register */ - if ((af.alt_bit1 == UNUSED) && (af.alt_bit1 == UNUSED)) + if ((af.alt_bit1 == UNUSED) && (af.alt_bit2 == UNUSED)) return mode; /* * if pin GPIOSEL bit is set and pin supports alternate function, |