[PATCH] oss/gus_card.c - convert cli to spinlocks

diff --git a/sound/oss/gus_card.c b/sound/oss/gus_card.c
index 8b77f4e3ac185ed89ad28f51676f4491382c63e8..022f94bfbb7368d0734faa802a152eff56dd3f3c 100644 (file)
--- a/sound/oss/gus_card.c
+++ b/sound/oss/gus_card.c
@@ -123,8 +123,6 @@ void gusintr(int irq, void *dev_id, struct pt_regs *dummy)
        unsigned char src;
        extern int gus_timer_enabled;
 
-       sti();
-
 #ifdef CONFIG_SOUND_GUSMAX
        if (have_gus_max) {
                struct address_info *hw_config = dev_id;

diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index 97c532e0906dcb483be05c5e24b76598f90b9048..dfc91e675b38b0c1a1d10449c56a42e87fbf4419 100644 (file)
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -821,7 +821,7 @@ static void via_chan_free (struct via_info *card, struct via_channel *chan)
 
        spin_unlock_irq (&card->lock);
 
-       synchronize_irq();
+       synchronize_irq(card->pdev->irq);
 
        DPRINTK ("EXIT\n");
 }