diff options
author | Stephen Warren <swarren@nvidia.com> | 2014-03-31 14:25:24 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-01 07:39:26 -0400 |
commit | e3efe3bedb6592465d9a2bd116d5e611dae362c3 (patch) | |
tree | 848f5ea2d0c535f5db8f67478196adac33d53c37 /sound | |
parent | c159a85013afbb8283f0c7272812952e04d5c3a1 (diff) |
ASoC: alc5632: fix uninit var in alc5632_probe()
alc5632_probe() returns ret, yet it is not initialized or set anywhere.
This ends up causing the function to appear to fail, and audio not to
work on the Toshiba AC100, with my compiler at least.
This function used to set ret in all cases, but recent cleanup removed
that.
Fixes: 5d6be5aa6bec ("ASoC: codec: Simplify ASoC probe code.")
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/alc5632.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c index ec071a6306ef..3ee8d4e41a99 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) | |||
1061 | static int alc5632_probe(struct snd_soc_codec *codec) | 1061 | static int alc5632_probe(struct snd_soc_codec *codec) |
1062 | { | 1062 | { |
1063 | struct alc5632_priv *alc5632 = snd_soc_codec_get_drvdata(codec); | 1063 | struct alc5632_priv *alc5632 = snd_soc_codec_get_drvdata(codec); |
1064 | int ret; | ||
1065 | 1064 | ||
1066 | /* power on device */ | 1065 | /* power on device */ |
1067 | alc5632_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 1066 | alc5632_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
@@ -1075,7 +1074,7 @@ static int alc5632_probe(struct snd_soc_codec *codec) | |||
1075 | return -EINVAL; | 1074 | return -EINVAL; |
1076 | } | 1075 | } |
1077 | 1076 | ||
1078 | return ret; | 1077 | return 0; |
1079 | } | 1078 | } |
1080 | 1079 | ||
1081 | /* power down chip */ | 1080 | /* power down chip */ |