Pull bugzilla-7897 into release branch

[sfrench/cifs-2.6.git] / sound / isa / gus / gus_dma.c

diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c
index 930f4bc56f34c44a4a1de70d975761b1d83fed15..44ee5d3674a1691b2d4f6803f2ca3d8a474e562a 100644 (file)
--- a/sound/isa/gus/gus_dma.c
+++ b/sound/isa/gus/gus_dma.c
@@ -149,10 +149,10 @@ static void snd_gf1_dma_interrupt(struct snd_gus_card * gus)
 
 int snd_gf1_dma_init(struct snd_gus_card * gus)
 {
-       down(&gus->dma_mutex);
+       mutex_lock(&gus->dma_mutex);
        gus->gf1.dma_shared++;
        if (gus->gf1.dma_shared > 1) {
-               up(&gus->dma_mutex);
+               mutex_unlock(&gus->dma_mutex);
                return 0;
        }
        gus->gf1.interrupt_handler_dma_write = snd_gf1_dma_interrupt;
@@ -160,7 +160,7 @@ int snd_gf1_dma_init(struct snd_gus_card * gus)
        gus->gf1.dma_data_pcm_last =
        gus->gf1.dma_data_synth = 
        gus->gf1.dma_data_synth_last = NULL;
-       up(&gus->dma_mutex);
+       mutex_unlock(&gus->dma_mutex);
        return 0;
 }
 
@@ -168,7 +168,7 @@ int snd_gf1_dma_done(struct snd_gus_card * gus)
 {
        struct snd_gf1_dma_block *block;
 
-       down(&gus->dma_mutex);
+       mutex_lock(&gus->dma_mutex);
        gus->gf1.dma_shared--;
        if (!gus->gf1.dma_shared) {
                snd_dma_disable(gus->gf1.dma1);
@@ -185,7 +185,7 @@ int snd_gf1_dma_done(struct snd_gus_card * gus)
                gus->gf1.dma_data_pcm_last =
                gus->gf1.dma_data_synth_last = NULL;
        }
-       up(&gus->dma_mutex);
+       mutex_unlock(&gus->dma_mutex);
        return 0;
 }