projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89d751d
)
ASoC: amd: fix an IS_ERR() vs NULL bug in probe
author
Dan Carpenter
<dan.carpenter@oracle.com>
Tue, 27 Jul 2021 08:17:56 +0000
(11:17 +0300)
committer
Mark Brown
<broonie@kernel.org>
Tue, 27 Jul 2021 12:14:53 +0000
(13:14 +0100)
The devm_ioremap() function returns NULL on error, it doesn't return
error pointers.
Fixes:
e550339ee652
("ASoC: amd: add vangogh i2s controller driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link:
https://lore.kernel.org/r/20210727081756.GA19121@kili
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/amd/vangogh/acp5x-i2s.c
patch
|
blob
|
history
diff --git
a/sound/soc/amd/vangogh/acp5x-i2s.c
b/sound/soc/amd/vangogh/acp5x-i2s.c
index
86b37c9
..
2705e57
100644
(file)
--- a/
sound/soc/amd/vangogh/acp5x-i2s.c
+++ b/
sound/soc/amd/vangogh/acp5x-i2s.c
@@
-399,8
+399,8
@@
static int acp5x_dai_probe(struct platform_device *pdev)
}
adata->acp5x_base = devm_ioremap(&pdev->dev, res->start,
resource_size(res));
- if (
IS_ERR(adata->acp5x_base)
)
- return
PTR_ERR(adata->acp5x_base)
;
+ if (
!adata->acp5x_base
)
+ return
-ENOMEM
;
adata->master_mode = I2S_MASTER_MODE_ENABLE;
dev_set_drvdata(&pdev->dev, adata);