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

Commit 86467ff2 authored by Wei Yongjun's avatar Wei Yongjun Committed by Linus Walleij
Browse files

pinctrl: tb10x: fix the error handling in tb10x_pinctrl_probe() 



This patch fix the error handling in tb10x_pinctrl_probe():
 - devm_ioremap_resource() return ERR_PTR() and never return NULL
 - remove the dev_err call to avoid redundant error message
 - pinctrl_register() returns NULL not ERR_PTR()

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fe61052a

drivers/pinctrl/pinctrl-tb10x.c

+4 −5
Original line number Diff line number Diff line
@@ -806,9 +806,8 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev) 
	mutex_init(&state->mutex);



	state->base = devm_ioremap_resource(dev, mem);

	if (!state->base) {

		dev_err(dev, "Request register region failed.\n");

		ret = -EBUSY;

	if (IS_ERR(state->base)) {

		ret = PTR_ERR(state->base);

		goto fail;

	}
@@ -830,9 +829,9 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev) 
	}



	state->pctl = pinctrl_register(&tb10x_pindesc, dev, state);

	if (IS_ERR(state->pctl)) {

	if (!state->pctl) {

		dev_err(dev, "could not register TB10x pin driver\n");

		ret = PTR_ERR(state->pctl);

		ret = -EINVAL;

		goto fail;

	}