Skip to content

L
linux

xiphi1978 / linux

通知 2
Star 0
Fork 0
L
linux

体验新版 GitCode，发现更多精彩内容 >>

提交 2625240d 编写于 作者: M Mark Brown
浏览文件
操作

Merge branch 'for-2.6.30' into for-2.6.31

上级 1a4ba05e 0c95de73
隐藏空白更改
内联 并排
Showing with 2 addition and 2 deletion
sound/soc/codecs/wm8350.c
浏览文件 @ 2625240d
...@@ -968,7 +968,7 @@ static int wm8350_pcm_trigger(struct snd_pcm_substream *substream, ...@@ -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 * required for LRC in master mode. The DACs or ADCs need a
* valid audio path i.e. pin -> ADC or DAC -> pin before * valid audio path i.e. pin -> ADC or DAC -> pin before
* the LRC will be enabled in master mode. */ * the LRC will be enabled in master mode. */
if (!master && cmd != SNDRV_PCM_TRIGGER_START) if (!master || cmd != SNDRV_PCM_TRIGGER_START)
return 0; return 0;
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
......
sound/soc/fsl/Kconfig
浏览文件 @ 2625240d
...@@ -21,7 +21,7 @@ config SND_SOC_MPC8610_HPCD ...@@ -21,7 +21,7 @@ config SND_SOC_MPC8610_HPCD
config SND_SOC_MPC5200_I2S config SND_SOC_MPC5200_I2S
tristate "Freescale MPC5200 PSC in I2S mode driver" 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 SND_SOC_OF_SIMPLE
select PPC_BESTCOMM_GEN_BD select PPC_BESTCOMM_GEN_BD
help help
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或