diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-27 20:47:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-27 20:47:35 +0100 |
| commit | 2625240d0732ac259591ed54371bc01e7bbfdd14 (patch) | |
| tree | 130abb44a2ab97af6fdf9c26daed9d86413845af /sound | |
| parent | 1a4ba05ec8369d62c10155a8931e81267bfbd31c (diff) | |
| parent | 0c95de73a711d376dc17afe484f919bd5b66c016 (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 2 | ||||
| -rw-r--r-- | sound/soc/fsl/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 3b1d0993bed..0275321ff8a 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -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) { diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 9fc90828337..e7dd79a1d8c 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -21,7 +21,7 @@ config SND_SOC_MPC8610_HPCD config SND_SOC_MPC5200_I2S tristate "Freescale MPC5200 PSC in I2S mode driver" - depends on PPC_MPC52xx && PPC_BESTCOMM + depends on PPC_MPC52xx && PPC_BESTCOMM && BROKEN select SND_SOC_OF_SIMPLE select PPC_BESTCOMM_GEN_BD help |