diff --git a/[refs] b/[refs]
index 3c9d638b69bd..cdfd31ca4a74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cd6dc2e3c2dbececb60a3a5ca52af645d9be205
+refs/heads/master: 3ee73aa077d1468b293bb208814a8c240eefa9b7
diff --git a/trunk/drivers/pinctrl/pinctrl-bcm2835.c b/trunk/drivers/pinctrl/pinctrl-bcm2835.c
index 956d585309b3..7e9be18ec2d2 100644
--- a/trunk/drivers/pinctrl/pinctrl-bcm2835.c
+++ b/trunk/drivers/pinctrl/pinctrl-bcm2835.c
@@ -1031,7 +1031,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) {
 		gpiochip_remove(&pc->gpio_chip);
-		return PTR_ERR(pc->pctl_dev);
+		return -EINVAL;
 	}
 
 	pc->gpio_range = bcm2835_pinctrl_gpio_range;