diff options
Diffstat (limited to 'sound/oss/dmasound/dmasound_awacs.c')
-rw-r--r-- | sound/oss/dmasound/dmasound_awacs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index 74f975676ccb..a17375141c3a 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
@@ -80,7 +80,7 @@ | |||
80 | #include <linux/kmod.h> | 80 | #include <linux/kmod.h> |
81 | #include <linux/interrupt.h> | 81 | #include <linux/interrupt.h> |
82 | #include <linux/input.h> | 82 | #include <linux/input.h> |
83 | #include <asm/semaphore.h> | 83 | #include <linux/mutex.h> |
84 | #ifdef CONFIG_ADB_CUDA | 84 | #ifdef CONFIG_ADB_CUDA |
85 | #include <linux/cuda.h> | 85 | #include <linux/cuda.h> |
86 | #endif | 86 | #endif |
@@ -130,7 +130,7 @@ static struct resource awacs_rsrc[3]; | |||
130 | static char awacs_name[64]; | 130 | static char awacs_name[64]; |
131 | static int awacs_revision; | 131 | static int awacs_revision; |
132 | static int awacs_sleeping; | 132 | static int awacs_sleeping; |
133 | static DECLARE_MUTEX(dmasound_sem); | 133 | static DEFINE_MUTEX(dmasound_mutex); |
134 | 134 | ||
135 | static int sound_device_id; /* exists after iMac revA */ | 135 | static int sound_device_id; /* exists after iMac revA */ |
136 | static int hw_can_byteswap = 1 ; /* most pmac sound h/w can */ | 136 | static int hw_can_byteswap = 1 ; /* most pmac sound h/w can */ |
@@ -312,11 +312,11 @@ extern int daca_enter_sleep(void); | |||
312 | extern int daca_leave_sleep(void); | 312 | extern int daca_leave_sleep(void); |
313 | 313 | ||
314 | #define TRY_LOCK() \ | 314 | #define TRY_LOCK() \ |
315 | if ((rc = down_interruptible(&dmasound_sem)) != 0) \ | 315 | if ((rc = mutex_lock_interruptible(&dmasound_mutex)) != 0) \ |
316 | return rc; | 316 | return rc; |
317 | #define LOCK() down(&dmasound_sem); | 317 | #define LOCK() mutex_lock(&dmasound_mutex); |
318 | 318 | ||
319 | #define UNLOCK() up(&dmasound_sem); | 319 | #define UNLOCK() mutex_unlock(&dmasound_mutex); |
320 | 320 | ||
321 | /* We use different versions that the ones provided in dmasound.h | 321 | /* We use different versions that the ones provided in dmasound.h |
322 | * | 322 | * |