summaryrefslogtreecommitdiffstats
path: root/drivers/net/smc911x.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-19 17:45:11 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-19 17:45:11 -0400
commit846050dd49719b1f68248807bba5c27bfc86f81a (patch)
tree79922936e8cde867ba90d753f79aa61f575e162b /drivers/net/smc911x.c
parent49666145de54b5d6d256442bb1bec03ffae1ac76 (diff)
parent2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff)
downloadop-kernel-dev-846050dd49719b1f68248807bba5c27bfc86f81a.zip
op-kernel-dev-846050dd49719b1f68248807bba5c27bfc86f81a.tar.gz
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/smc911x.c')
-rw-r--r--drivers/net/smc911x.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 4c4adf4c..4438fe8 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -1090,6 +1090,7 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id, struct pt_regs *regs
/* Spurious interrupt check */
if ((SMC_GET_IRQ_CFG() & (INT_CFG_IRQ_INT_ | INT_CFG_IRQ_EN_)) !=
(INT_CFG_IRQ_INT_ | INT_CFG_IRQ_EN_)) {
+ spin_unlock_irqrestore(&lp->lock, flags);
return IRQ_NONE;
}
OpenPOWER on IntegriCloud