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 branch 'for-3.20/core' of git://git.kernel.dk/linux-block
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pinctrl
/
pinctrl-tz1090-pdc.c
diff --git
a/drivers/pinctrl/pinctrl-tz1090-pdc.c
b/drivers/pinctrl/pinctrl-tz1090-pdc.c
index 146e48a9b83977da22edacdadde230b93329574e..fab6aafa6a9f4466984ba83a3cf0719a1df7b2dc 100644
(file)
--- a/
drivers/pinctrl/pinctrl-tz1090-pdc.c
+++ b/
drivers/pinctrl/pinctrl-tz1090-pdc.c
@@
-415,7
+415,7
@@
static int tz1090_pdc_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;