3.6-stable review patch. If anyone has any objections, please let me know.
------------------ From: Wei Yongjun <yongjun_...@trendmicro.com.cn> commit 5c855c8e2be67f2d5a989ef1190098f924f9f820 upstream. Fix the return value of cs42l52_set_fmt() when clock inversion is not allowed and also remove the useless variable ret. dpatch engine is used to auto generate this patch. (https://github.com/weiyj/dpatch) [We had been assigning to ret but then ignoring the value we assgined -- broonie] Signed-off-by: Wei Yongjun <yongjun_...@trendmicro.com.cn> Signed-off-by: Mark Brown <broo...@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- sound/soc/codecs/cs42l52.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -774,7 +774,6 @@ static int cs42l52_set_fmt(struct snd_so { struct snd_soc_codec *codec = codec_dai->codec; struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec); - int ret = 0; u8 iface = 0; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { @@ -823,7 +822,7 @@ static int cs42l52_set_fmt(struct snd_so case SND_SOC_DAIFMT_NB_IF: break; default: - ret = -EINVAL; + return -EINVAL; } cs42l52->config.format = iface; snd_soc_write(codec, CS42L52_IFACE_CTL1, cs42l52->config.format); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
