diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 12:10:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 12:10:31 -0700 |
| commit | 661adc423d70203a56723701aaf255e16950dfdb (patch) | |
| tree | 72a62c9016667cba8a63ab3f038c69df3692a085 /sound/pci/ctxfi/ctatc.h | |
| 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/pci/ctxfi/ctatc.h')
| -rw-r--r-- | sound/pci/ctxfi/ctatc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h index a03347232e8..9fe620ea5f3 100644 --- a/sound/pci/ctxfi/ctatc.h +++ b/sound/pci/ctxfi/ctatc.h @@ -19,7 +19,7 @@ #define CTATC_H #include <linux/types.h> -#include <linux/spinlock_types.h> +#include <linux/mutex.h> #include <linux/pci.h> #include <linux/timer.h> #include <sound/core.h> @@ -90,7 +90,7 @@ struct ct_atc { void (*unmap_audio_buffer)(struct ct_atc *atc, struct ct_atc_pcm *apcm); unsigned long (*get_ptp_phys)(struct ct_atc *atc, int index); - spinlock_t atc_lock; + struct mutex atc_mutex; int (*pcm_playback_prepare)(struct ct_atc *atc, struct ct_atc_pcm *apcm); |