Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-2-0]: src/sys/dev/pci Pullup rev 1.12 (requested by bouyer in tic...



details:   https://anonhg.NetBSD.org/src/rev/c50778fb527e
branches:  netbsd-2-0
changeset: 561284:c50778fb527e
user:      jmc <jmc%NetBSD.org@localhost>
date:      Sat Jun 05 05:00:14 2004 +0000

description:
Pullup rev 1.12 (requested by bouyer in ticket #443)

Don't try to bus_space_subregion() registers that didn't get mapped.

diffstat:

 sys/dev/pci/pciide_common.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r f3a04dc85a4b -r c50778fb527e sys/dev/pci/pciide_common.c
--- a/sys/dev/pci/pciide_common.c       Sat Jun 05 04:59:36 2004 +0000
+++ b/sys/dev/pci/pciide_common.c       Sat Jun 05 05:00:14 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_common.c,v 1.8.2.1 2004/05/09 08:34:54 jdc Exp $        */
+/*     $NetBSD: pciide_common.c,v 1.8.2.2 2004/06/05 05:00:14 jmc Exp $        */
 
 
 /*
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.8.2.1 2004/05/09 08:34:54 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.8.2.2 2004/06/05 05:00:14 jmc Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -412,6 +412,9 @@
                    ", but unsupported register maptype (0x%x)", maptype);
        }
 
+       if (sc->sc_dma_ok == 0)
+               return;
+
        /*
         * Set up the default handles for the DMA registers.
         * Just reserve 32 bits for each handle, unless space



Home | Main Index | Thread Index | Old Index