Re: sound driver (opti) spinlock bug, 2.6.7-rc3

[Andrew Morton]

David Ford <david+challenge-response@xxxxxxxxxxxxx> wrote:
>
> sound/isa/opti9xx/opti92x-ad1848.c:428: 
>  spin_lock(sound/isa/opti9xx/opti92x-ad1848.c:cf40eea0) already locked by 
>  sound/isa/opti9xx/opti92x-ad1848.c/604

Like this?

The locking in there seems fairly optimistic - looks like someone did a
cli() translation on it.

--- 25/sound/isa/opti9xx/opti92x-ad1848.c~opti92x-ad1848-locking-fix	2004-06-12 17:09:38.699325296 -0700
+++ 25-akpm/sound/isa/opti9xx/opti92x-ad1848.c	2004-06-12 17:16:38.029577408 -0700
@@ -601,13 +601,11 @@ __skip_base:
 	dma_bits |= 0x04;
 #endif	/* CS4231 || OPTi93X */
 
-	spin_lock_irqsave(&chip->lock, flags);
 #ifndef OPTi93X
-	 outb(irq_bits << 3 | dma_bits, chip->wss_base);
+	outb(irq_bits << 3 | dma_bits, chip->wss_base);
 #else /* OPTi93X */
 	snd_opti9xx_write(chip, OPTi9XX_MC_REG(3), (irq_bits << 3 | dma_bits));
 #endif /* OPTi93X */
-	spin_unlock_irqrestore(&chip->lock, flags);
 
 __skip_resources:
 	if (chip->hardware > OPTi9XX_HW_82C928) {
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/