lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-2.6.30' into for-2.6.31

Browse Source
This commit is contained in:
Mark Brown
2009-04-27 20:47:35 +01:00
parent 1a4ba05ec8 0c95de73a7
commit 2625240d07
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/wm8350.c
View File

@ -968,7 +968,7 @@ static int wm8350_pcm_trigger(struct snd_pcm_substream *substream,
* required for LRC in master mode. The DACs or ADCs need a
* valid audio path i.e. pin -> ADC or DAC -> pin before
* the LRC will be enabled in master mode. */
if (!master && cmd != SNDRV_PCM_TRIGGER_START)
if (!master || cmd != SNDRV_PCM_TRIGGER_START)
return 0;
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {