Module Name: src Committed By: dsl Date: Fri Nov 27 20:56:29 UTC 2009
Modified Files: src/sys/dev/isa: if_ntwoc_isa.c Log Message: Add patch from PR/11805 To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/isa/if_ntwoc_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/isa/if_ntwoc_isa.c diff -u src/sys/dev/isa/if_ntwoc_isa.c:1.21 src/sys/dev/isa/if_ntwoc_isa.c:1.22 --- src/sys/dev/isa/if_ntwoc_isa.c:1.21 Tue May 12 09:10:15 2009 +++ src/sys/dev/isa/if_ntwoc_isa.c Fri Nov 27 20:56:28 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ntwoc_isa.c,v 1.21 2009/05/12 09:10:15 cegger Exp $ */ +/* $NetBSD: if_ntwoc_isa.c,v 1.22 2009/11/27 20:56:28 dsl Exp $ */ /* * Copyright (c) 1999 Christian E. Hopps * Copyright (c) 1996 John Hay. @@ -29,11 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ntwoc_isa.c,v 1.21 2009/05/12 09:10:15 cegger Exp $ + * $Id: if_ntwoc_isa.c,v 1.22 2009/11/27 20:56:28 dsl Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.21 2009/05/12 09:10:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.22 2009/11/27 20:56:28 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -705,6 +705,9 @@ mcr = bus_space_read_1(sc->sc_sca.sc_iot, sc->sc_sca.sc_ioh, NTWOC_MCR); mcr |= (NTWOC_MCR_DTR0 | NTWOC_MCR_DTR1); bus_space_write_1(sc->sc_sca.sc_iot, sc->sc_sca.sc_ioh, NTWOC_MCR, mcr); + + /* turn off the card */ + bus_space_write_1(sc->sc_sca.sc_iot, sc->sc_sca.sc_ioh, NTWOC_PCR, 0); } static void