diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-07-10 11:17:11 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-07-10 11:17:11 +0200 |
commit | f371f12f3e9840771026aa6a9312b554c5bfd6ec (patch) | |
tree | 734b122157bd0ecb34f03d12c46ce7bfc5892955 /sound/soc/fsl/mpc5200_dma.c | |
parent | 7ce1695c40e765e99cd790f55fc68037bc05d080 (diff) | |
parent | 637a935aaba2f05e2178c9d1b714d7a2c36c8b44 (diff) | |
download | linux-f371f12f3e9840771026aa6a9312b554c5bfd6ec.tar.bz2 |
Merge branch 'fix/asoc' into for-linus
* fix/asoc:
ASoC: Fix wm8753 register cache size and initialization
ASoC: add locking to mpc5200-psc-ac97 driver
ASoC: Fix mpc5200-psc-ac97 to ensure the data ready bit is cleared
ASoC: Fix register cache initialisation for WM8753
Diffstat (limited to 'sound/soc/fsl/mpc5200_dma.c')
-rw-r--r-- | sound/soc/fsl/mpc5200_dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index efec33a1c5bd..f0a2d4071998 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -456,6 +456,7 @@ int mpc5200_audio_dma_create(struct of_device *op) return -ENODEV; spin_lock_init(&psc_dma->lock); + mutex_init(&psc_dma->mutex); psc_dma->id = be32_to_cpu(*prop); psc_dma->irq = irq; psc_dma->psc_regs = regs; |