Merge tag 'fbdev-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

[cascardo/linux.git] / drivers / base / pinctrl.c

diff --git a/drivers/base/pinctrl.c b/drivers/base/pinctrl.c
index 0762975..5917b4b 100644 (file)
--- a/drivers/base/pinctrl.c
+++ b/drivers/base/pinctrl.c
@@ -91,9 +91,13 @@ cleanup_alloc:
        devm_kfree(dev, dev->pins);
        dev->pins = NULL;
 
-       /* Only return deferrals */
-       if (ret != -EPROBE_DEFER)
-               ret = 0;
+       /* Return deferrals */
+       if (ret == -EPROBE_DEFER)
+               return ret;
+       /* Return serious errors */
+       if (ret == -EINVAL)
+               return ret;
+       /* We ignore errors like -ENOENT meaning no pinctrl state */
 
-       return ret;
+       return 0;
 }