]> git.baikalelectronics.ru Git - kernel.git/commitdiff
pinctrl: sprd: check for allocation failure
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 7 Sep 2017 07:29:26 +0000 (10:29 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 12 Sep 2017 09:26:40 +0000 (11:26 +0200)
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>
drivers/pinctrl/sprd/pinctrl-sprd.c

index c178b4a6d7f5680fcd0825763da9d4b8ed56d116..e52a01e1f662eaca77e6554a69b272d9aec8f078 100644 (file)
@@ -1100,12 +1100,16 @@ int sprd_pinctrl_remove(struct platform_device *pdev)
 
 void sprd_pinctrl_shutdown(struct platform_device *pdev)
 {
-       struct pinctrl *pinctl = devm_pinctrl_get(&pdev->dev);
+       struct pinctrl *pinctl;
        struct pinctrl_state *state;
 
+       pinctl = devm_pinctrl_get(&pdev->dev);
+       if (IS_ERR(pinctl))
+               return;
        state = pinctrl_lookup_state(pinctl, "shutdown");
-       if (!IS_ERR(state))
-               pinctrl_select_state(pinctl, state);
+       if (IS_ERR(state))
+               return;
+       pinctrl_select_state(pinctl, state);
 }
 
 MODULE_DESCRIPTION("SPREADTRUM Pin Controller Driver");