[-next] ASoC: rt715-sdca: Fix return value check in rt715_sdca_sdw_probe()

Commit Message

Wei Yongjun March 9, 2021, 1:14 p.m. UTC

From: Wei Yongjun <[e-mail]>

In case of error, the function devm_regmap_init_sdw_mbq() and
devm_regmap_init_sdw() returns ERR_PTR() not NULL. The NULL test
in the return value check should be replaced with IS_ERR().

Fixes: 393c52d2d109 ("ASoC: rt715-sdca: Add RT715 sdca vendor-specific driver")
Reported-by: Hulk Robot <[e-mail]>
Signed-off-by: Wei Yongjun <[e-mail]>
---
 sound/soc/codecs/rt715-sdca-sdw.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Mark Brown March 9, 2021, 7:06 p.m. UTC | #1

On Tue, 9 Mar 2021 13:14:58 +0000, 'Wei Yongjun wrote:
> In case of error, the function devm_regmap_init_sdw_mbq() and
> devm_regmap_init_sdw() returns ERR_PTR() not NULL. The NULL test
> in the return value check should be replaced with IS_ERR().

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: rt715-sdca: Fix return value check in rt715_sdca_sdw_probe()
      commit: bcfb088e7686b45b1f323e92315954e97bf634bc

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Patch

diff --git a/sound/soc/codecs/rt715-sdca-sdw.c b/sound/soc/codecs/rt715-sdca-sdw.c
index bcced85876b0..1350798406f0 100644
--- a/sound/soc/codecs/rt715-sdca-sdw.c
+++ b/sound/soc/codecs/rt715-sdca-sdw.c
@@ -184,12 +184,12 @@  static int rt715_sdca_sdw_probe(struct sdw_slave *slave,
 
 	/* Regmap Initialization */
 	mbq_regmap = devm_regmap_init_sdw_mbq(slave, &rt715_sdca_mbq_regmap);
-	if (!mbq_regmap)
-		return -EINVAL;
+	if (IS_ERR(mbq_regmap))
+		return PTR_ERR(mbq_regmap);
 
 	regmap = devm_regmap_init_sdw(slave, &rt715_sdca_regmap);
-	if (!regmap)
-		return -EINVAL;
+	if (IS_ERR(regmap))
+		return PTR_ERR(regmap);
 
 	return rt715_sdca_init(&slave->dev, mbq_regmap, regmap, slave);
 }