From 03406615dabb96e8d8f22c92376874318f1516cf Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Tue, 1 Apr 2008 01:22:45 +0200 Subject: [PATCH] --- yaml --- r: 87956 b: refs/heads/master c: cabce28ec0a0ae3d0ddfa4461f0e8be94ade9e46 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/plip.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3c0c1669b5ba..a9d0f4539f85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9edadbf790d72adf6ebed476cb5caf7743e7e4a +refs/heads/master: cabce28ec0a0ae3d0ddfa4461f0e8be94ade9e46 diff --git a/trunk/drivers/net/plip.c b/trunk/drivers/net/plip.c index fee3d7b1feba..1e965427b0e9 100644 --- a/trunk/drivers/net/plip.c +++ b/trunk/drivers/net/plip.c @@ -903,17 +903,18 @@ plip_interrupt(void *dev_id) struct net_local *nl; struct plip_local *rcv; unsigned char c0; + unsigned long flags; nl = netdev_priv(dev); rcv = &nl->rcv_data; - spin_lock_irq (&nl->lock); + spin_lock_irqsave (&nl->lock, flags); c0 = read_status(dev); if ((c0 & 0xf8) != 0xc0) { if ((dev->irq != -1) && (net_debug > 1)) printk(KERN_DEBUG "%s: spurious interrupt\n", dev->name); - spin_unlock_irq (&nl->lock); + spin_unlock_irqrestore (&nl->lock, flags); return; } @@ -942,7 +943,7 @@ plip_interrupt(void *dev_id) break; } - spin_unlock_irq(&nl->lock); + spin_unlock_irqrestore(&nl->lock, flags); } static int