diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 17:10:56 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 17:10:56 +0100 |
commit | 725278e0ecdabbbced6f1b05a23473ec9e4cafee (patch) | |
tree | 6f0843aa39f5a2df292613b9ed0b537be5047301 /arch/arm/mach-mv78xx0 | |
parent | ARM: Fix DMA coherent allocator alignment (diff) | |
parent | ARM: orion5x/kirkwood/mv78xx0: fix MPP configuration corner cases (diff) | |
download | linux-725278e0ecdabbbced6f1b05a23473ec9e4cafee.tar.xz linux-725278e0ecdabbbced6f1b05a23473ec9e4cafee.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r-- | arch/arm/mach-mv78xx0/mpp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-mv78xx0/mpp.c b/arch/arm/mach-mv78xx0/mpp.c index 354ac514eb89..84db2dfc475c 100644 --- a/arch/arm/mach-mv78xx0/mpp.c +++ b/arch/arm/mach-mv78xx0/mpp.c @@ -54,7 +54,7 @@ void __init mv78xx0_mpp_conf(unsigned int *mpp_list) } printk("\n"); - while (*mpp_list) { + for ( ; *mpp_list; mpp_list++) { unsigned int num = MPP_NUM(*mpp_list); unsigned int sel = MPP_SEL(*mpp_list); int shift, gpio_mode; @@ -83,8 +83,6 @@ void __init mv78xx0_mpp_conf(unsigned int *mpp_list) if (sel != 0) gpio_mode = 0; orion_gpio_set_valid(num, gpio_mode); - - mpp_list++; } printk(KERN_DEBUG " final MPP regs:"); |