aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-10-09 07:30:41 +0200
committerTakashi Iwai <tiwai@suse.de>2014-10-09 07:30:41 +0200
commitfd1a2a90d08b0052fa52bd36cebd0592c9e537c2 (patch)
tree6a0d03afeb4476803ac37c66b6fa7fb4c03aa5a2 /sound/soc/soc-pcm.c
parentALSA: hda - Add dock port support to Thinkpad L440 (71aa:501e) (diff)
parentMerge remote-tracking branches 'asoc/fix/88pm860x', 'asoc/fix/fsl', 'asoc/fix/imx', 'asoc/fix/mc13783', 'asoc/fix/rockchip' and 'asoc/fix/simple' into asoc-linus (diff)
downloadlinux-dev-fd1a2a90d08b0052fa52bd36cebd0592c9e537c2.tar.xz
linux-dev-fd1a2a90d08b0052fa52bd36cebd0592c9e537c2.zip
Merge tag 'asoc-v3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.18 A few small fixes, mostly small although a few really nasty ones like the interaction between GPIO 0 and simple-card.
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 642c86240752..002311afdeaa 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -352,7 +352,7 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream)
} else {
for (i = 0; i < rtd->num_codecs; i++) {
codec_dai = rtd->codec_dais[i];
- if (codec_dai->driver->playback.sig_bits == 0) {
+ if (codec_dai->driver->capture.sig_bits == 0) {
bits = 0;
break;
}