summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2005-02-16 14:29:15 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2005-02-16 14:29:15 +0000
commit6adaef0b472ca68d8adbd71a26f2386ec38abd87 (patch)
treed95ce88f3e9135cdcbe382f33b217345a0543cb9
parent1ada7f9e0898ab75da5025edfeef9de76e1ce026 (diff)
Fix scoping error when unhooking the interrupt handler. reyk@ ok
-rw-r--r--sys/dev/cardbus/if_ath_cardbus.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c
index d57184e3c7f..4e6cad90e50 100644
--- a/sys/dev/cardbus/if_ath_cardbus.c
+++ b/sys/dev/cardbus/if_ath_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ath_cardbus.c,v 1.2 2004/11/23 09:39:29 reyk Exp $ */
+/* $OpenBSD: if_ath_cardbus.c,v 1.3 2005/02/16 14:29:14 aaron Exp $ */
/* $NetBSD: if_ath_cardbus.c,v 1.4 2004/08/02 19:14:28 mycroft Exp $ */
/*
@@ -217,9 +217,10 @@ ath_cardbus_detach(struct device *self, int flags)
/*
* Unhook the interrupt handler.
*/
- if (csc->sc_ih != NULL)
+ if (csc->sc_ih != NULL) {
cardbus_intr_disestablish(ct->ct_cc, ct->ct_cf, csc->sc_ih);
csc->sc_ih = NULL;
+ }
/*
* Release bus space and close window.