diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-09-07 03:29:26 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2017-09-12 05:26:40 -0400 |
commit | 41470c379b4f8d9a1513d930338fadfbccc287b6 (patch) | |
tree | 5e82a8715fb7d81877734b05834ab458b7e1b457 | |
parent | baec7e687aa066f6fa257222a0def5ea9b5b1c40 (diff) |
pinctrl: sprd: check for allocation failure
devm_pinctrl_get() could fail with ERR_PTR(-ENOMEM) so I have added a
check for that. I also reversed the other IS_ERR() test because it was
a little confusing to test one way and then the opposite a couple lines
later.
Fixes: 41d32cfce1ae ("pinctrl: sprd: Add Spreadtrum pin control driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/pinctrl/sprd/pinctrl-sprd.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c index c178b4a6d7f5..e52a01e1f662 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd.c +++ b/drivers/pinctrl/sprd/pinctrl-sprd.c | |||
@@ -1100,12 +1100,16 @@ int sprd_pinctrl_remove(struct platform_device *pdev) | |||
1100 | 1100 | ||
1101 | void sprd_pinctrl_shutdown(struct platform_device *pdev) | 1101 | void sprd_pinctrl_shutdown(struct platform_device *pdev) |
1102 | { | 1102 | { |
1103 | struct pinctrl *pinctl = devm_pinctrl_get(&pdev->dev); | 1103 | struct pinctrl *pinctl; |
1104 | struct pinctrl_state *state; | 1104 | struct pinctrl_state *state; |
1105 | 1105 | ||
1106 | pinctl = devm_pinctrl_get(&pdev->dev); | ||
1107 | if (IS_ERR(pinctl)) | ||
1108 | return; | ||
1106 | state = pinctrl_lookup_state(pinctl, "shutdown"); | 1109 | state = pinctrl_lookup_state(pinctl, "shutdown"); |
1107 | if (!IS_ERR(state)) | 1110 | if (IS_ERR(state)) |
1108 | pinctrl_select_state(pinctl, state); | 1111 | return; |
1112 | pinctrl_select_state(pinctl, state); | ||
1109 | } | 1113 | } |
1110 | 1114 | ||
1111 | MODULE_DESCRIPTION("SPREADTRUM Pin Controller Driver"); | 1115 | MODULE_DESCRIPTION("SPREADTRUM Pin Controller Driver"); |