diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-12-31 11:13:41 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-12-31 11:13:41 -0500 |
commit | c9a458519dd69eb512a074f920a81d4906548306 (patch) | |
tree | 7371674c6800b295eddef28ac3c75a6be12ebe2b | |
parent | 48d882978eb0a15547093b4542a82b5c22548041 (diff) | |
parent | c6068d3a7b408554a832181b98091ee5a00d8b85 (diff) |
Merge branch 'topic/msbits' into for-next
-rw-r--r-- | sound/soc/soc-pcm.c | 2 |
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) | |||
304 | static void soc_pcm_set_msb(struct snd_pcm_substream *substream, int bits) | 304 | static void soc_pcm_set_msb(struct snd_pcm_substream *substream, int bits) |
305 | { | 305 | { |
306 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 306 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
307 | int ret, i; | 307 | int ret; |
308 | 308 | ||
309 | if (!bits) | 309 | if (!bits) |
310 | return; | 310 | return; |