summaryrefslogtreecommitdiff
path: root/sys/arch/arm/xscale
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2005-01-09 07:11:33 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2005-01-09 07:11:33 +0000
commit8a3292b1706ec632f056a93868c1373b9e1e9ee8 (patch)
tree19ff79ed68b2eae61b72481cb0906489e982318e /sys/arch/arm/xscale
parent05b5faec8871cf2f250983ebfcfe81a4e459212d (diff)
intr_disestablish
ok drahn@
Diffstat (limited to 'sys/arch/arm/xscale')
-rw-r--r--sys/arch/arm/xscale/pxa2x0_ohci.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_ohci.c b/sys/arch/arm/xscale/pxa2x0_ohci.c
index 66b6c42fd58..af14405cb27 100644
--- a/sys/arch/arm/xscale/pxa2x0_ohci.c
+++ b/sys/arch/arm/xscale/pxa2x0_ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_ohci.c,v 1.4 2005/01/05 11:01:27 dlg Exp $ */
+/* $OpenBSD: pxa2x0_ohci.c,v 1.5 2005/01/09 07:11:32 dlg Exp $ */
/*
* Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
@@ -139,7 +139,8 @@ pxaohci_attach(struct device *parent, struct device *self, void *aux)
sc->sc.sc_bus.bdev.dv_xname, r);
bus_space_unmap(sc->sc.iot, sc->sc.ioh, sc->sc.sc_size);
sc->sc.sc_size = 0;
- /* XXX disestablish */
+ pxa2x0_intr_disestablish(sc->sc_ih);
+ sc->sc_ih = NULL;
pxa2x0_clkman_config(CKEN_USBHC, 0);
return;
}
@@ -160,12 +161,10 @@ pxaohci_detach(device_ptr_t self, int flags)
if (rv)
return (rv);
-#ifdef notdef
if (sc->sc_ih != NULL) {
- /* XXX disestablish */
+ pxa2x0_intr_disestablish(sc->sc_ih);
sc->sc_ih = NULL;
}
-#endif
/* Full host reset */
hr = bus_space_read_4(sc->sc.iot, sc->sc.ioh, USBHC_HR);