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

[karo-tx-linux.git] / drivers / pinctrl / pinctrl-st.c

diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c
index 7effedfd47610e33001bf3e2af30e114991f0944..04d4506ae18d963d898fcfb54737a4776c1bb2e3 100644 (file)
--- a/drivers/pinctrl/pinctrl-st.c
+++ b/drivers/pinctrl/pinctrl-st.c
@@ -1299,9 +1299,9 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
                return -ENOMEM;
 
        info->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
-       if (!info->regmap) {
+       if (IS_ERR(info->regmap)) {
                dev_err(info->dev, "No syscfg phandle specified\n");
-               return -ENOMEM;
+               return PTR_ERR(info->regmap);
        }
        info->data = of_match_node(st_pctl_of_match, np)->data;
 
@@ -1376,9 +1376,9 @@ static int st_pctl_probe(struct platform_device *pdev)
        pctl_desc->name         = dev_name(&pdev->dev);
 
        info->pctl = pinctrl_register(pctl_desc, &pdev->dev, info);
-       if (IS_ERR(info->pctl)) {
+       if (!info->pctl) {
                dev_err(&pdev->dev, "Failed pinctrl registration\n");
-               return PTR_ERR(info->pctl);
+               return -EINVAL;
        }
 
        for (i = 0; i < info->nbanks; i++)
@@ -1391,7 +1391,7 @@ static struct platform_driver st_pctl_driver = {
        .driver = {
                .name = "st-pinctrl",
                .owner = THIS_MODULE,
-               .of_match_table = of_match_ptr(st_pctl_of_match),
+               .of_match_table = st_pctl_of_match,
        },
        .probe = st_pctl_probe,
 };