diff options
| author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2007-03-24 03:33:11 +0000 |
|---|---|---|
| committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2007-03-24 03:33:11 +0000 |
| commit | 1ee4176a4f7135213886d93c239360c9aa11cb8e (patch) | |
| tree | 39399c144859db0d5f25241ea8193c602283b0b5 /sys/arch | |
| parent | 0c06d1d3ddf961cd08472ae40acf70330488bf92 (diff) | |
Call the new ohci_checkrev function on xscale, otherwise the USB version
is not set correctly and the USB bus does not attach.
Tested ckuethe@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_ohci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_ohci.c b/sys/arch/arm/xscale/pxa2x0_ohci.c index 6a8b32c0c35..ff407086446 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.19 2005/04/08 02:32:54 dlg Exp $ */ +/* $OpenBSD: pxa2x0_ohci.c,v 1.20 2007/03/24 03:33:10 pascoe Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -107,10 +107,15 @@ pxaohci_attach(struct device *parent, struct device *self, void *aux) } strlcpy(sc->sc.sc_vendor, "PXA27x", sizeof(sc->sc.sc_vendor)); + + if (ohci_checkrev(&sc->sc) != USBD_NORMAL_COMPLETION) + goto unsupported; + r = ohci_init(&sc->sc); if (r != USBD_NORMAL_COMPLETION) { printf("%s: init failed, error=%d\n", sc->sc.sc_bus.bdev.dv_xname, r); +unsupported: pxa2x0_intr_disestablish(sc->sc_ih); sc->sc_ih = NULL; pxaohci_disable(sc); |