Merge branch 'topic/msbits' into for-next

2014-12-31 17:13:41 +01:00 · 2014-12-31 17:13:41 +01:00 · c9a458519d
parent 48d882978e c6068d3a7b
commit c9a458519d
1 changed files with 1 additions and 1 deletions
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@ -304,7 +304,7 @@ static bool soc_pcm_has_symmetry(struct snd_pcm_substream *substream)
 static void soc_pcm_set_msb(struct snd_pcm_substream *substream, int bits)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	int ret, i;
+	int ret;

 	if (!bits)
 		return;