瀏覽代碼

plip: replace spin_lock_irq with spin_lock_irqsave in irq context

Plip uses spin_lock_irq/spin_unlock_irq in its IRQ handler (called from
parport IRQ handler), the latter enables interrupts without parport
subsystem IRQ handler expecting it.

The bug can be seen if you compile kernel with lock dependency checking
and use plip --- it produces a warning.

This patch changes it to spin_lock_irqsave/spin_lock_irqrestore, so that
it doesn't enable interrupts when already disabled.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Mikulas Patocka 17 年之前
父節點
當前提交
cabce28ec0
共有 1 個文件被更改,包括 4 次插入3 次删除
  1. 4 3
      drivers/net/plip.c

+ 4 - 3
drivers/net/plip.c

@@ -903,17 +903,18 @@ plip_interrupt(void *dev_id)
 	struct net_local *nl;
 	struct net_local *nl;
 	struct plip_local *rcv;
 	struct plip_local *rcv;
 	unsigned char c0;
 	unsigned char c0;
+	unsigned long flags;
 
 
 	nl = netdev_priv(dev);
 	nl = netdev_priv(dev);
 	rcv = &nl->rcv_data;
 	rcv = &nl->rcv_data;
 
 
-	spin_lock_irq (&nl->lock);
+	spin_lock_irqsave (&nl->lock, flags);
 
 
 	c0 = read_status(dev);
 	c0 = read_status(dev);
 	if ((c0 & 0xf8) != 0xc0) {
 	if ((c0 & 0xf8) != 0xc0) {
 		if ((dev->irq != -1) && (net_debug > 1))
 		if ((dev->irq != -1) && (net_debug > 1))
 			printk(KERN_DEBUG "%s: spurious interrupt\n", dev->name);
 			printk(KERN_DEBUG "%s: spurious interrupt\n", dev->name);
-		spin_unlock_irq (&nl->lock);
+		spin_unlock_irqrestore (&nl->lock, flags);
 		return;
 		return;
 	}
 	}
 
 
@@ -942,7 +943,7 @@ plip_interrupt(void *dev_id)
 		break;
 		break;
 	}
 	}
 
 
-	spin_unlock_irq(&nl->lock);
+	spin_unlock_irqrestore(&nl->lock, flags);
 }
 }
 
 
 static int
 static int