projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
drivers
/
pinctrl
/
berlin
/
berlin.c
diff --git
a/drivers/pinctrl/berlin/berlin.c
b/drivers/pinctrl/berlin/berlin.c
index
65b0e21
..
f495806
100644
(file)
--- a/
drivers/pinctrl/berlin/berlin.c
+++ b/
drivers/pinctrl/berlin/berlin.c
@@
-323,9
+323,9
@@
int berlin_pinctrl_probe(struct platform_device *pdev,
}
pctrl->pctrl_dev = pinctrl_register(&berlin_pctrl_desc, dev, pctrl);
}
pctrl->pctrl_dev = pinctrl_register(&berlin_pctrl_desc, dev, pctrl);
- if (
!pctrl->pctrl_dev
) {
+ if (
IS_ERR(pctrl->pctrl_dev)
) {
dev_err(dev, "failed to register pinctrl driver\n");
dev_err(dev, "failed to register pinctrl driver\n");
- return
-EINVAL
;
+ return
PTR_ERR(pctrl->pctrl_dev)
;
}
return 0;
}
return 0;