aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2020-01-15 14:30:27 +0000
committerMark Brown <broonie@kernel.org>2020-01-17 15:30:59 +0000
commit20435df1c1d708b44f58da17653f2ea609aee790 (patch)
treefcde7288611c1d620836d66099f7b27c1179d9de
parentASoC: rt715: remove unused including <linux/version.h> (diff)
downloadlinux-dev-20435df1c1d708b44f58da17653f2ea609aee790.tar.xz
linux-dev-20435df1c1d708b44f58da17653f2ea609aee790.zip
ASoC: rt700: fix return value check in rt700_sdw_probe()
In case of error, the function devm_regmap_init() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 7d2a5f9ae41e ("ASoC: rt700: add rt700 codec driver") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Link: https://lore.kernel.org/r/20200115143027.94364-1-weiyongjun1@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/rt700-sdw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c
index 314103601af3..a4b95425886f 100644
--- a/sound/soc/codecs/rt700-sdw.c
+++ b/sound/soc/codecs/rt700-sdw.c
@@ -460,8 +460,8 @@ static int rt700_sdw_probe(struct sdw_slave *slave,
regmap = devm_regmap_init(&slave->dev, NULL,
&slave->dev, &rt700_regmap);
- if (!regmap)
- return -EINVAL;
+ if (IS_ERR(regmap))
+ return PTR_ERR(regmap);
rt700_init(&slave->dev, sdw_regmap, regmap, slave);