diff options
| author | martin <martin@NetBSD.org> | 2013-09-25 18:54:48 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2013-09-25 18:54:48 +0000 |
| commit | ec4bcd846d30f411c9b69e95c7b564b4bb7e9ecf (patch) | |
| tree | c201ebb7d3fa433ca9b0f11994936376cd5bd5ba /sys/dev | |
| parent | 01999631eedb778b2dd5cddbe637fc926011a8cb (diff) | |
Avoid using unmaped PCI registers. From Wolfgang Stukenbrock in
PR kern/48236.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/iavc_pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/iavc_pci.c b/sys/dev/pci/iavc_pci.c index 701362dbba9..6dd5abf6bae 100644 --- a/sys/dev/pci/iavc_pci.c +++ b/sys/dev/pci/iavc_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: iavc_pci.c,v 1.14 2012/10/27 17:18:32 chs Exp $ */ +/* $NetBSD: iavc_pci.c,v 1.15 2013/09/25 18:54:48 martin Exp $ */ /* * Copyright (c) 2001-2003 Cubical Solutions Ltd. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.14 2012/10/27 17:18:32 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.15 2013/09/25 18:54:48 martin Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -139,8 +139,6 @@ iavc_pci_attach(device_t parent, device_t self, void *aux) sc->sc_dma = 0; sc->dmat = pa->pa_dmat; - iavc_b1dma_reset(sc); - if (pci_mapreg_map(pa, IAVC_PCI_IOBA, PCI_MAPREG_TYPE_IO, 0, &sc->sc_io_bt, &sc->sc_io_bh, &psc->io_base, &psc->io_size)) { aprint_error(": unable to map i/o registers\n"); @@ -154,6 +152,8 @@ iavc_pci_attach(device_t parent, device_t self, void *aux) } aprint_normal(": %s\n", pp->name); + iavc_b1dma_reset(sc); + if (pp->npp_product == PCI_PRODUCT_AVM_T1) { aprint_error_dev(sc->sc_dev, "sorry, PRI not yet supported\n"); return; |
