summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2020-01-15 14:30:34 +0000
committerMark Brown <broonie@kernel.org>2020-01-17 15:31:07 +0000
commitb03c29c1b13afa18ee88cce07bbe87298eb0d3a3 (patch)
tree7c66f7de6b6e248ce78b42b9b470ce2d805773a4 /sound
parent20435df1c1d708b44f58da17653f2ea609aee790 (diff)
downloadlinux-b03c29c1b13afa18ee88cce07bbe87298eb0d3a3.tar.gz
linux-b03c29c1b13afa18ee88cce07bbe87298eb0d3a3.tar.bz2
linux-b03c29c1b13afa18ee88cce07bbe87298eb0d3a3.zip
ASoC: rt711: fix return value check in rt711_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: 320b8b0d13b8 ("ASoC: rt711: add rt711 codec driver") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Link: https://lore.kernel.org/r/20200115143034.94492-1-weiyongjun1@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/rt711-sdw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c
index e28dc84ede5b..85e62e1059cd 100644
--- a/sound/soc/codecs/rt711-sdw.c
+++ b/sound/soc/codecs/rt711-sdw.c
@@ -460,8 +460,8 @@ static int rt711_sdw_probe(struct sdw_slave *slave,
regmap = devm_regmap_init(&slave->dev, NULL,
&slave->dev, &rt711_regmap);
- if (!regmap)
- return -EINVAL;
+ if (IS_ERR(regmap))
+ return PTR_ERR(regmap);
rt711_init(&slave->dev, sdw_regmap, regmap, slave);