summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2004-11-03 17:12:29 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2004-11-03 17:12:29 +0000
commit45728544da8401bb99781193fa6e28e1d80d13d1 (patch)
tree170cea39c323cf596eeb155eb20c3ff16ca415b2 /sys/dev
parentf5ebc1be680512d8ae1a7c472699456ed93d41e7 (diff)
Return 1 instead of 0 in ipw_intr() if the interrupt is handled by us.
Ignore invalid 0xffffffff interrupts. ok claudio@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_ipw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 23ee4ca0bb9..deafcfa9fb4 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/* $Id: if_ipw.c,v 1.22 2004/11/03 17:11:14 damien Exp $ */
+/* $Id: if_ipw.c,v 1.23 2004/11/03 17:12:28 damien Exp $ */
/*-
* Copyright (c) 2004
@@ -732,7 +732,7 @@ ipw_intr(void *arg)
struct ipw_softc *sc = arg;
u_int32_t r;
- if ((r = CSR_READ_4(sc, IPW_CSR_INTR)) == 0)
+ if ((r = CSR_READ_4(sc, IPW_CSR_INTR)) == 0 || r == 0xffffffff)
return 0;
/* Disable interrupts */
@@ -762,7 +762,7 @@ ipw_intr(void *arg)
/* Re-enable interrupts */
CSR_WRITE_4(sc, IPW_CSR_INTR_MASK, IPW_INTR_MASK);
- return 0;
+ return 1;
}
int