diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-27 22:04:40 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-27 22:04:40 +0100 |
| commit | 29f141fed01a09050207c4d41fc5811520d81146 (patch) | |
| tree | c55a51dca4a0e4da9fdc2b904eefbde37d2a5b03 /arch/arm/plat-orion/mpp.c | |
| parent | dt: add empty of_find_compatible_node function (diff) | |
| parent | doc: dt: Fix broken reference in gpio-leds documentation (diff) | |
| download | linux-29f141fed01a09050207c4d41fc5811520d81146.tar.xz linux-29f141fed01a09050207c4d41fc5811520d81146.zip | |
Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge
Diffstat (limited to 'arch/arm/plat-orion/mpp.c')
| -rw-r--r-- | arch/arm/plat-orion/mpp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c index 91553432711d..3b1e17bd3d17 100644 --- a/arch/arm/plat-orion/mpp.c +++ b/arch/arm/plat-orion/mpp.c @@ -64,8 +64,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask, gpio_mode |= GPIO_INPUT_OK; if (*mpp_list & MPP_OUTPUT_MASK) gpio_mode |= GPIO_OUTPUT_OK; - if (sel != 0) - gpio_mode = 0; + orion_gpio_set_valid(num, gpio_mode); } |