| From a569abe0e69467db2c07fe57de26551a979f2d2c Mon Sep 17 00:00:00 2001 |
| From: Ludovic Desroches <ludovic.desroches@atmel.com> |
| Date: Mon, 8 Jun 2015 17:16:37 +0200 |
| Subject: [PATCH 067/129] pinctrl: don't print unavailable function groups |
| |
| There is no reason to try to print groups associated to a function if |
| get_function_groups returns an error. Moreover, it can lead to a NULL |
| pointer dereference error. |
| |
| Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit 9d7ebbbf2264c4ad3c8d50fcb84952126184a7ad) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pinctrl/pinmux.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c |
| index 77f82b23f7be..e7ae890dcf1a 100644 |
| --- 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++) |
| -- |
| 2.6.2 |
| |
