renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
Code

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

Browse Source 
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: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Wei Yongjun 2013-10-21 10:55:29 +08:00 committed by Linus Walleij
parent fe61052ae9
commit 86467ff2dd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/pinctrl/pinctrl-tb10x.c
View File

@ -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;
}