Merge branch 'for-2.6.30' into for-2.6.31

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 3b1d0993bed947fa815c559b0cd8db1aa144f24f..0275321ff8ab29840c994bb107c3b54d8529f1aa 100644 (file)
--- 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 9fc9082833716dc4b16df21bf6e5e30267913f8f..e7dd79a1d8cd5056386bc7a8e368e3e4b01cd51e 100644 (file)
--- 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