Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f37b1b4 authored by Axel Lin's avatar Axel Lin Committed by Linus Walleij
Browse files

pinctrl: spear: Make get_gpio_pingroup return NULL when no gpio_pingroup 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: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 80357203

drivers/pinctrl/spear/pinctrl-spear.c

+3 −3
Original line number Diff line number Diff line
@@ -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++) {
@@ -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,