diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-03-15 07:16:28 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-03-15 07:16:28 +0100 |
| commit | 47f4e0c1c87f34bf1fc74b8935a37d229a147946 (patch) | |
| tree | 29c7fe96a5dbc8870e75ecbb027e39682a5fcbab /drivers/pinctrl/pinctrl-abx500.c | |
| parent | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/... (diff) | |
| parent | pinctrl: generic: Fix compilation error (diff) | |
| download | linux-47f4e0c1c87f34bf1fc74b8935a37d229a147946.tar.xz linux-47f4e0c1c87f34bf1fc74b8935a37d229a147946.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into pinmux-base
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, |