projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[platform/kernel/linux-starfive.git]
/
drivers
/
pwm
/
pwm-mxs.c
diff --git
a/drivers/pwm/pwm-mxs.c
b/drivers/pwm/pwm-mxs.c
index
7ec345f
..
a53d309
100644
(file)
--- a/
drivers/pwm/pwm-mxs.c
+++ b/
drivers/pwm/pwm-mxs.c
@@
-139,9
+139,9
@@
static int mxs_pwm_probe(struct platform_device *pdev)
return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- mxs->base = devm_
request_and_ioremap
(&pdev->dev, res);
- if (
!mxs->base
)
- return
-EADDRNOTAVAIL
;
+ mxs->base = devm_
ioremap_resource
(&pdev->dev, res);
+ if (
IS_ERR(mxs->base)
)
+ return
PTR_ERR(mxs->base)
;
pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
if (IS_ERR(pinctrl))
pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
if (IS_ERR(pinctrl))