1 files changed, 11 insertions, 10 deletions

diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index b7217adaf1d7..12e618851262 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -27,6 +27,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
+#include <linux/mutex.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -277,7 +278,7 @@ struct atiixp {
         unsigned int codec_not_ready_bits;      /* for codec detection */
 
         int spdif_over_aclink;          /* passed from the module option */
-        struct semaphore open_mutex;    /* playback open mutex */
+        struct mutex open_mutex;        /* playback open mutex */
 };
 
 
@@ -1051,9 +1052,9 @@ static int snd_atiixp_playback_open(struct snd_pcm_substream *substream)
         struct atiixp *chip = snd_pcm_substream_chip(substream);
         int err;
 
-        down(&chip->open_mutex);
+        mutex_lock(&chip->open_mutex);
         err = snd_atiixp_pcm_open(substream, &chip->dmas[ATI_DMA_PLAYBACK], 0);
-        up(&chip->open_mutex);
+        mutex_unlock(&chip->open_mutex);
         if (err < 0)
                 return err;
         substream->runtime->hw.channels_max = chip->max_channels;
@@ -1068,9 +1069,9 @@ static int snd_atiixp_playback_close(struct snd_pcm_substream *substream)
 {
         struct atiixp *chip = snd_pcm_substream_chip(substream);
         int err;
-        down(&chip->open_mutex);
+        mutex_lock(&chip->open_mutex);
         err = snd_atiixp_pcm_close(substream, &chip->dmas[ATI_DMA_PLAYBACK]);
-        up(&chip->open_mutex);
+        mutex_unlock(&chip->open_mutex);
         return err;
 }
 
@@ -1090,12 +1091,12 @@ static int snd_atiixp_spdif_open(struct snd_pcm_substream *substream)
 {
         struct atiixp *chip = snd_pcm_substream_chip(substream);
         int err;
-        down(&chip->open_mutex);
+        mutex_lock(&chip->open_mutex);
         if (chip->spdif_over_aclink) /* share DMA_PLAYBACK */
                 err = snd_atiixp_pcm_open(substream, &chip->dmas[ATI_DMA_PLAYBACK], 2);
         else
                 err = snd_atiixp_pcm_open(substream, &chip->dmas[ATI_DMA_SPDIF], -1);
-        up(&chip->open_mutex);
+        mutex_unlock(&chip->open_mutex);
         return err;
 }
 
@@ -1103,12 +1104,12 @@ static int snd_atiixp_spdif_close(struct snd_pcm_substream *substream)
 {
         struct atiixp *chip = snd_pcm_substream_chip(substream);
         int err;
-        down(&chip->open_mutex);
+        mutex_lock(&chip->open_mutex);
         if (chip->spdif_over_aclink)
                 err = snd_atiixp_pcm_close(substream, &chip->dmas[ATI_DMA_PLAYBACK]);
         else
                 err = snd_atiixp_pcm_close(substream, &chip->dmas[ATI_DMA_SPDIF]);
-        up(&chip->open_mutex);
+        mutex_unlock(&chip->open_mutex);
         return err;
 }
 
@@ -1560,7 +1561,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
         }
 
         spin_lock_init(&chip->reg_lock);
-        init_MUTEX(&chip->open_mutex);
+        mutex_init(&chip->open_mutex);
         chip->card = card;
         chip->pci = pci;
         chip->irq = -1;