projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'please-pull-fixmcelog' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pinctrl
/
pinctrl-tz1090.c
diff --git
a/drivers/pinctrl/pinctrl-tz1090.c
b/drivers/pinctrl/pinctrl-tz1090.c
index df8cb1e5b7b4778f1b82b3879cdd0c90a6182858..8bd73075f9dd3e658c7e41210eb90efec676589e 100644
(file)
--- a/
drivers/pinctrl/pinctrl-tz1090.c
+++ b/
drivers/pinctrl/pinctrl-tz1090.c
@@
-1131,7
+1131,7
@@
static int tz1090_pinctrl_dt_subnode_to_map(struct device *dev,
function = NULL;
}
- ret = pinconf_generic_parse_dt_config(np, &configs, &num_configs);
+ ret = pinconf_generic_parse_dt_config(np,
NULL,
&configs, &num_configs);
if (ret)
return ret;