2014-04-04 11:44:39

by Christoph Jaeger

[permalink] [raw]
Subject: [PATCH] ASoC: alc56(23|32): fix undefined return value of probing code

Commit 5d6be5aa ("ASoC: codec: Simplify ASoC probe code.") left variable
'ret', whose value is returned, uninitialized. Since it is not used
otherwise, remove it.

Signed-off-by: Christoph Jaeger <[email protected]>
---
sound/soc/codecs/alc5623.c | 3 +--
sound/soc/codecs/alc5632.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index 09f7e77..f500905 100644
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -902,7 +902,6 @@ static int alc5623_probe(struct snd_soc_codec *codec)
{
struct alc5623_priv *alc5623 = snd_soc_codec_get_drvdata(codec);
struct snd_soc_dapm_context *dapm = &codec->dapm;
- int ret;

alc5623_reset(codec);

@@ -961,7 +960,7 @@ static int alc5623_probe(struct snd_soc_codec *codec)
return -EINVAL;
}

- return ret;
+ return 0;
}

/* power down chip */
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index ec071a6..3ee8d4e 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -1061,7 +1061,6 @@ static int alc5632_resume(struct snd_soc_codec *codec)
static int alc5632_probe(struct snd_soc_codec *codec)
{
struct alc5632_priv *alc5632 = snd_soc_codec_get_drvdata(codec);
- int ret;

/* power on device */
alc5632_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
@@ -1075,7 +1074,7 @@ static int alc5632_probe(struct snd_soc_codec *codec)
return -EINVAL;
}

- return ret;
+ return 0;
}

/* power down chip */
--
1.9.0


2014-04-04 12:48:32

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] ASoC: alc56(23|32): fix undefined return value of probing code

On Fri, Apr 04, 2014 at 01:44:19PM +0200, Christoph Jaeger wrote:
> Commit 5d6be5aa ("ASoC: codec: Simplify ASoC probe code.") left variable
> 'ret', whose value is returned, uninitialized. Since it is not used
> otherwise, remove it.

Applied, thanks.


Attachments:
(No filename) (253.00 B)
signature.asc (836.00 B)
Digital signature
Download all attachments