Skip to content

Commit

Permalink
pinctrl: spear: Make get_gpio_pingroup return NULL when no gpio_pingr…
Browse files Browse the repository at this point in the history
…oup found

Currently get_gpio_pingroup() may return NULL or ERR_PTR(-EINVAL) when
no gpio_pingroup found. The caller in gpio_request_endisable() only
checks if the return value is NULL. Return ERR_PTR(-EINVAL) for
get_gpio_pingroup() causes problem and seems not necessary.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Axel Lin authored and Linus Walleij committed Nov 15, 2012
1 parent 8035720 commit 6f37b1b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/pinctrl/spear/pinctrl-spear.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,12 +286,12 @@ static struct spear_gpio_pingroup *get_gpio_pingroup(struct spear_pmx *pmx,
unsigned pin)
{
struct spear_gpio_pingroup *gpio_pingroup;
int i = 0, j;
int i, j;

if (!pmx->machdata->gpio_pingroups)
return NULL;

for (; i < pmx->machdata->ngpio_pingroups; i++) {
for (i = 0; i < pmx->machdata->ngpio_pingroups; i++) {
gpio_pingroup = &pmx->machdata->gpio_pingroups[i];

for (j = 0; j < gpio_pingroup->npins; j++) {
Expand All @@ -300,7 +300,7 @@ static struct spear_gpio_pingroup *get_gpio_pingroup(struct spear_pmx *pmx,
}
}

return ERR_PTR(-EINVAL);
return NULL;
}

static int gpio_request_endisable(struct pinctrl_dev *pctldev,
Expand Down

0 comments on commit 6f37b1b

Please sign in to comment.