summaryrefslogtreecommitdiffstats
path: root/Documentation/pinctrl.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-04-14 10:29:40 +0200
committerIngo Molnar <mingo@kernel.org>2017-04-14 10:29:40 +0200
commit0ba78a95a6629975ff16545ae868fa1bb38f786a (patch)
treebb51f571bb187bc10f3a9639789afd4cf49b5b27 /Documentation/pinctrl.txt
parentrtmutex: Plug preempt count leak in rt_mutex_futex_unlock() (diff)
parentMerge branch 'akpm' (patches from Andrew) (diff)
downloadlinux-0ba78a95a6629975ff16545ae868fa1bb38f786a.tar.xz
linux-0ba78a95a6629975ff16545ae868fa1bb38f786a.zip
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/pinctrl.txt')
-rw-r--r--Documentation/pinctrl.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index 54bd5faa8782..f2af35f6d6b2 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -77,9 +77,15 @@ static struct pinctrl_desc foo_desc = {
int __init foo_probe(void)
{
+ int error;
+
struct pinctrl_dev *pctl;
- return pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl);
+ error = pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl);
+ if (error)
+ return error;
+
+ return pinctrl_enable(pctl);
}
To enable the pinctrl subsystem and the subgroups for PINMUX and PINCONF and