summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-12-31 17:13:41 +0100
committerTakashi Iwai <tiwai@suse.de>2014-12-31 17:13:41 +0100
commitc9a458519dd69eb512a074f920a81d4906548306 (patch)
tree7371674c6800b295eddef28ac3c75a6be12ebe2b /sound/soc/soc-pcm.c
parent48d882978eb0a15547093b4542a82b5c22548041 (diff)
parentc6068d3a7b408554a832181b98091ee5a00d8b85 (diff)
downloadblackbird-op-linux-c9a458519dd69eb512a074f920a81d4906548306.tar.gz
blackbird-op-linux-c9a458519dd69eb512a074f920a81d4906548306.zip
Merge branch 'topic/msbits' into for-next
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r--sound/soc/soc-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index d6e8d6b3fccd..6b0136e7cb88 100644
--- 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;
OpenPOWER on IntegriCloud