Merge tag 'nfs-for-3.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-block.git] / drivers / pinctrl / sh-pfc / pinctrl.c

diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
index 910deaefa0ac54b807174a91a4643f7f5f1cae20..072e7c62cab7dc0f6f254381d377a808423f863b 100644 (file)
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
@@ -122,7 +122,7 @@ static int sh_pfc_dt_subnode_to_map(struct device *dev, struct device_node *np,
                return ret;
        }
 
-       ret = pinconf_generic_parse_dt_config(np, &configs, &num_configs);
+       ret = pinconf_generic_parse_dt_config(np, NULL, &configs, &num_configs);
        if (ret < 0)
                return ret;