aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Figa <tomasz.figa@gmail.com>2014-09-23 15:05:37 -0400
committerTomasz Figa <tomasz.figa@gmail.com>2014-11-09 07:10:28 -0500
commit87993273feb7f9379ec79cd9c25d195c4b93b7da (patch)
tree165dbeaee908c8599aed7595dac4d8fd4d57236f
parent6e08d6bbebebcf70f982d7190c4b6dc456cedd57 (diff)
pinctrl: samsung: Make samsung_pinctrl_get_soc_data use ERR_PTR()
Currently the function returns a valid pointer on success and NULL on error, so exact error code is lost. This patch changes return convention of the function to use ERR_PTR() on error instead. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
-rw-r--r--drivers/pinctrl/samsung/pinctrl-samsung.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c
index 2d37c8f49f3c..8ac750329f58 100644
--- a/drivers/pinctrl/samsung/pinctrl-samsung.c
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.c
@@ -981,7 +981,7 @@ static struct samsung_pin_ctrl *samsung_pinctrl_get_soc_data(
981 id = of_alias_get_id(node, "pinctrl"); 981 id = of_alias_get_id(node, "pinctrl");
982 if (id < 0) { 982 if (id < 0) {
983 dev_err(&pdev->dev, "failed to get alias id\n"); 983 dev_err(&pdev->dev, "failed to get alias id\n");
984 return NULL; 984 return ERR_PTR(-ENOENT);
985 } 985 }
986 match = of_match_node(samsung_pinctrl_dt_match, node); 986 match = of_match_node(samsung_pinctrl_dt_match, node);
987 ctrl = (struct samsung_pin_ctrl *)match->data + id; 987 ctrl = (struct samsung_pin_ctrl *)match->data + id;
@@ -1033,9 +1033,9 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
1033 } 1033 }
1034 1034
1035 ctrl = samsung_pinctrl_get_soc_data(drvdata, pdev); 1035 ctrl = samsung_pinctrl_get_soc_data(drvdata, pdev);
1036 if (!ctrl) { 1036 if (IS_ERR(ctrl)) {
1037 dev_err(&pdev->dev, "driver data not available\n"); 1037 dev_err(&pdev->dev, "driver data not available\n");
1038 return -EINVAL; 1038 return PTR_ERR(ctrl);
1039 } 1039 }
1040 drvdata->ctrl = ctrl; 1040 drvdata->ctrl = ctrl;
1041 drvdata->dev = dev; 1041 drvdata->dev = dev;