diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-25 14:58:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-25 14:58:37 +0200 |
| commit | d5fc3b5fe374f24b6773c22e90ef4bdda718b845 (patch) | |
| tree | 3d8f2cfe059e418ad7eb37ababbc2f2cafe213c6 /sound/soc/pxa | |
| parent | ASoC: Add core suspend and resume callbacks to WM8961 (diff) | |
| parent | MAINTAINERS: Add entry for twl4030 series soc codec driver (diff) | |
| download | linux-d5fc3b5fe374f24b6773c22e90ef4bdda718b845.tar.xz linux-d5fc3b5fe374f24b6773c22e90ef4bdda718b845.zip | |
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/magician.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index 9fe4ad20615c..8889cd371608 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c @@ -186,7 +186,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, /* set cpu DAI configuration */ ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A | - SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBS_CFS); + SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBS_CFS); if (ret < 0) return ret; |