1 files changed, 20 insertions, 18 deletions

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index be52fabf6dc0..ab403b2ed26b 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -87,6 +87,9 @@ static char *omap_mux_options;
 int __init omap_mux_init_gpio(int gpio, int val)
 {
         struct omap_mux_entry *e;
+        struct omap_mux *gpio_mux;
+        u16 old_mode;
+        u16 mux_mode;
         int found = 0;
 
         if (!gpio)
@@ -95,34 +98,33 @@ int __init omap_mux_init_gpio(int gpio, int val)
         list_for_each_entry(e, &muxmodes, node) {
                 struct omap_mux *m = &e->mux;
                 if (gpio == m->gpio) {
-                        u16 old_mode;
-                        u16 mux_mode;
-
-                        old_mode = omap_mux_read(m->reg_offset);
-                        mux_mode = val & ~(OMAP_MUX_NR_MODES - 1);
-                        if (omap_mux_flags & MUXABLE_GPIO_MODE3)
-                                mux_mode |= OMAP_MUX_MODE3;
-                        else
-                                mux_mode |= OMAP_MUX_MODE4;
-                        printk(KERN_DEBUG "mux: Setting signal "
-                                "%s.gpio%i 0x%04x -> 0x%04x\n",
-                                m->muxnames[0], gpio, old_mode, mux_mode);
-                        omap_mux_write(mux_mode, m->reg_offset);
+                        gpio_mux = m;
                         found++;
                 }
         }
 
-        if (found == 1)
-                return 0;
+        if (found == 0) {
+                printk(KERN_ERR "mux: Could not set gpio%i\n", gpio);
+                return -ENODEV;
+        }
 
         if (found > 1) {
-                printk(KERN_ERR "mux: Multiple gpio paths for gpio%i\n", gpio);
+                printk(KERN_INFO "mux: Multiple gpio paths (%d) for gpio%i\n",
+                                found, gpio);
                 return -EINVAL;
         }
 
-        printk(KERN_ERR "mux: Could not set gpio%i\n", gpio);
+        old_mode = omap_mux_read(gpio_mux->reg_offset);
+        mux_mode = val & ~(OMAP_MUX_NR_MODES - 1);
+        if (omap_mux_flags & MUXABLE_GPIO_MODE3)
+                mux_mode |= OMAP_MUX_MODE3;
+        else
+                mux_mode |= OMAP_MUX_MODE4;
+        printk(KERN_DEBUG "mux: Setting signal %s.gpio%i 0x%04x -> 0x%04x\n",
+                        gpio_mux->muxnames[0], gpio, old_mode, mux_mode);
+        omap_mux_write(mux_mode, gpio_mux->reg_offset);
 
-        return -ENODEV;
+        return 0;
 }
 
 int __init omap_mux_init_signal(char *muxname, int val)