Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinmux.c

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 77f82b23f7becb89db460a29b28bfa923b5139fc..e7ae890dcf1aed58faf752049e16609fb8a3809b 100644 (file)
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -557,9 +557,12 @@ static int pinmux_functions_show(struct seq_file *s, void *what)
 
                ret = pmxops->get_function_groups(pctldev, func_selector,
                                                  &groups, &num_groups);
-               if (ret)
+               if (ret) {
                        seq_printf(s, "function %s: COULD NOT GET GROUPS\n",
                                   func);
+                       func_selector++;
+                       continue;
+               }
 
                seq_printf(s, "function: %s, groups = [ ", func);
                for (i = 0; i < num_groups; i++)