diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:10:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:10:31 -0400 |
| commit | 661adc423d70203a56723701aaf255e16950dfdb (patch) | |
| tree | 72a62c9016667cba8a63ab3f038c69df3692a085 /sound/soc/pxa | |
| parent | 15bdb5652689d51cc0316de61774d2732472d9e1 (diff) | |
| parent | 3b13b5ce8c1b52379aff80666d31d4354354b2d4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ctxfi - Fix deadlock with xfi-timer
ALSA: intel8x0 - Fix PCM position craziness
ALSA: usb-audio - rework quirk for TerraTec Aureon USB 5.1 MkII
ASoC: magician: fix PXA SSP clock polarity
ASoC: Instantiate any forgotten DAPM widgets
ASoC: Revert duplicated code in SSM2602 driver
ALSA: hda - Add quirk for Acer Aspire 6935G
ALSA: ctxfi - Replace atc lock to mutex
ASoC: Remove odd bit clock ratios for WM8903
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 c89a3cdf31e4..326955dea36c 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c | |||
| @@ -184,7 +184,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, | |||
| 184 | 184 | ||
| 185 | /* set cpu DAI configuration */ | 185 | /* set cpu DAI configuration */ |
| 186 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A | | 186 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A | |
| 187 | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBS_CFS); | 187 | SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBS_CFS); |
| 188 | if (ret < 0) | 188 | if (ret < 0) |
| 189 | return ret; | 189 | return ret; |
| 190 | 190 | ||