[PATCH] pinctrl: fix return value in bcm2835_pinctrl_probe()

Wei Yongjun weiyj.lk at gmail.com
Sun Oct 7 10:01:15 EDT 2012

From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>

In case of error, the function pinctrl_register() returns
NULL not ERR_PTR(). The PTR_ERR() in the return value
should be replaced with error no.

dpatch engine is used to auto generate this patch.

Signed-off-by: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
 drivers/pinctrl/pinctrl-bcm2835.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-bcm2835.c b/drivers/pinctrl/pinctrl-bcm2835.c
index a4adee6..1f9a878 100644
--- a/drivers/pinctrl/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/pinctrl-bcm2835.c
@@ -1032,7 +1032,7 @@ static int __devinit bcm2835_pinctrl_probe(struct platform_device *pdev)
 	pc->pctl_dev = pinctrl_register(&bcm2835_pinctrl_desc, dev, pc);
 	if (!pc->pctl_dev) {
-		return PTR_ERR(pc->pctl_dev);
+		return -EINVAL;
 	pc->gpio_range = bcm2835_pinctrl_gpio_range;

More information about the linux-rpi-kernel mailing list