The patch

ASoC: ak4458: rstn_control - return a non-zero on error only

has been applied to the asoc tree at

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

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 176a11834b65ec35e3b7a953f87fb9cc41309497 Mon Sep 17 00:00:00 2001

From: Viorel Suman viorel.suman@nxp.com Date: Mon, 13 May 2019 10:02:42 +0000 Subject: [PATCH] ASoC: ak4458: rstn_control - return a non-zero on error only

snd_soc_component_update_bits() may return 1 if operation was successful and the value of the register changed. Return a non-zero in ak4458_rstn_control for an error only.

Signed-off-by: Shengjiu Wang shengjiu.wang@nxp.com Signed-off-by: Viorel Suman viorel.suman@nxp.com Reviewed-by: Daniel Baluta daniel.baluta@nxp.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/codecs/ak4458.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c index 4c5c3ec92609..71562154c0b1 100644 --- a/sound/soc/codecs/ak4458.c +++ b/sound/soc/codecs/ak4458.c @@ -304,7 +304,10 @@ static int ak4458_rstn_control(struct snd_soc_component *component, int bit) AK4458_00_CONTROL1, AK4458_RSTN_MASK, 0x0); - return ret; + if (ret < 0) + return ret; + + return 0; }

static int ak4458_hw_params(struct snd_pcm_substream *substream,

On Mon, May 13, 2019 at 1:05 PM Viorel Suman viorel.suman@nxp.com wrote:

AK4458 is probed successfully even if AK4458 is not present - this is caused by probe function returning no error on i2c access failure. Return an error on probe if i2c access has failed.

Signed-off-by: Shengjiu Wang shengjiu.wang@nxp.com Signed-off-by: Viorel Suman viorel.suman@nxp.com

Reviewed-by: Daniel Baluta daniel.baluta@nxp.com

---

sound/soc/codecs/ak4458.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c index baf990a..7156215 100644 --- a/sound/soc/codecs/ak4458.c +++ b/sound/soc/codecs/ak4458.c @@ -539,9 +539,10 @@ static void ak4458_power_on(struct ak4458_priv *ak4458) } }

-static void ak4458_init(struct snd_soc_component *component) +static int ak4458_init(struct snd_soc_component *component) { struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);

•   int ret;
  
    /* External Mute ON */
    if (ak4458->mute_gpiod)
  

@@ -549,21 +550,21 @@ static void ak4458_init(struct snd_soc_component *component)

    ak4458_power_on(ak4458);

•   snd_soc_component_update_bits(component, AK4458_00_CONTROL1,
  

•   ret = snd_soc_component_update_bits(component, AK4458_00_CONTROL1,
                        0x80, 0x80);   /* ACKS bit = 1; 10000000 */
  

•   if (ret < 0)
  

•           return ret;
  
  

•   ak4458_rstn_control(component, 1);
  

•   return ak4458_rstn_control(component, 1);
  

}

static int ak4458_probe(struct snd_soc_component *component) { struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);

•   ak4458_init(component);
  

•   ak4458->fs = 48000;
  
  

•   return 0;
  

•   return ak4458_init(component);
  

}

static void ak4458_remove(struct snd_soc_component *component)

2.7.4

---

Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel