diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-16 17:38:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-16 17:38:40 +0200 |
| commit | 3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a (patch) | |
| tree | 4d9bfc4017f038a7f94358c4061afcb264ba6d08 /sound/pci/ctxfi/ctatc.h | |
| parent | 21ce3cd63365b0d07794adeb4325944bfa86fb4e (diff) | |
| parent | 8dca419721d188bfee5f19fad45275856c619a5c (diff) | |
Merge branch 'topic/ctxfi' into for-linus
* topic/ctxfi:
ALSA: ctxfi - Fix deadlock with xfi-timer
ALSA: ctxfi - Replace atc lock to mutex
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); |