Messages in this thread Patch in this message |  | | Date | Thu, 29 Aug 2002 21:56:27 +0200 | Subject | [PATCH] 3/10 sound/oss/ics2101.c | From | pwaechtler@mac ... |
| |
--- vanilla-2.5.33/sound/oss/ics2101.c Sat Apr 20 18:25:20 2002 +++ linux-2.5-cli-oss/sound/oss/ics2101.c Fri Aug 16 13:59:55 2002 @@ -15,6 +15,7 @@ * Bartlomiej Zolnierkiewicz : added __init to ics2101_mixer_init() */ #include <linux/init.h> +#include <linux/spinlock.h> #include "sound_config.h" #include <linux/ultrasound.h> @@ -28,6 +29,7 @@ extern int *gus_osp; extern int gus_base; +extern spinlock_t lock; static int volumes[ICS_MIXDEVS]; static int left_fix[ICS_MIXDEVS] = {1, 1, 1, 2, 1, 2}; @@ -85,13 +87,12 @@ attn_addr |= 0x03; } - save_flags(flags); - cli(); + spin_lock_irqsave(&lock, flags); outb((ctrl_addr), u_MixSelect); outb((selector[dev]), u_MixData); outb((attn_addr), u_MixSelect); outb(((unsigned char) vol), u_MixData); - restore_flags(flags); + spin_unlock_irqrestore(&lock, flags); } static int set_volumes(int dev, int vol) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |