[alsa-devel] Applied "ASoC: tlv320aic32x4: Fix potential uninitialized variable" to the asoc tree

[Mark Brown]

The patch

   ASoC: tlv320aic32x4: Fix potential uninitialized variable

has been applied to the asoc tree at

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

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

>From a23e34c064b933cf5f24e443f86bbfdd624d2e8b Mon Sep 17 00:00:00 2001
From: Annaliese McDermond <nh6z at nh6z.net>
Date: Mon, 8 Apr 2019 21:41:59 -0700
Subject: [PATCH] ASoC: tlv320aic32x4: Fix potential uninitialized variable

Fix compiler warning about uninitialized variable reported by
Stephen Rothwell <sfr at canb.auug.org.au>.

Signed-off-by: Annaliese McDermond <nh6z at nh6z.net>
Signed-off-by: Mark Brown <broonie at kernel.org>
---
 sound/soc/codecs/tlv320aic32x4-clk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/tlv320aic32x4-clk.c b/sound/soc/codecs/tlv320aic32x4-clk.c
index 9e4899eb1d8e..156c153c12ab 100644
--- a/sound/soc/codecs/tlv320aic32x4-clk.c
+++ b/sound/soc/codecs/tlv320aic32x4-clk.c
@@ -82,7 +82,7 @@ static int clk_aic32x4_pll_get_muldiv(struct clk_aic32x4 *pll,
 	int ret;
 
 	ret = regmap_read(pll->regmap, AIC32X4_PLLPR, &val);
-	if (ret)
+	if (ret < 0)
 		return ret;
 	settings->r = val & AIC32X4_PLL_R_MASK;
 	settings->p = (val & AIC32X4_PLL_P_MASK) >> AIC32X4_PLL_P_SHIFT;
-- 
2.20.1