projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pinctrl-v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pinctrl
/
qcom
/
pinctrl-ssbi-mpp.c
diff --git
a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
index 2d1b69f171be7c4dcffeba6199536f65075b604e..6652b8d7f707aefc5656edd348f95e0d139c21da 100644
(file)
--- a/
drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
+++ b/
drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
@@
-814,9
+814,9
@@
static int pm8xxx_mpp_probe(struct platform_device *pdev)
#endif
pctrl->pctrl = pinctrl_register(&pctrl->desc, &pdev->dev, pctrl);
#endif
pctrl->pctrl = pinctrl_register(&pctrl->desc, &pdev->dev, pctrl);
- if (
!pctrl->pctrl
) {
+ if (
IS_ERR(pctrl->pctrl)
) {
dev_err(&pdev->dev, "couldn't register pm8xxx mpp driver\n");
dev_err(&pdev->dev, "couldn't register pm8xxx mpp driver\n");
- return
-ENODEV
;
+ return
PTR_ERR(pctrl->pctrl)
;
}
pctrl->chip = pm8xxx_mpp_template;
}
pctrl->chip = pm8xxx_mpp_template;