[src/netbsd-1-5]: src/sys/dev/pcmcia Pullup 1.15 [itojun]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/34dbb8fa6112
branches:  netbsd-1-5
changeset: 489841:34dbb8fa6112
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Oct 17 23:20:53 2000 +0000

description:
Pullup 1.15 [itojun]:
correct memory size to be mapped.  PR 11242.

diffstat:

 sys/dev/pcmcia/if_cnw.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 970d20e7438a -r 34dbb8fa6112 sys/dev/pcmcia/if_cnw.c
--- a/sys/dev/pcmcia/if_cnw.c   Tue Oct 17 23:12:11 2000 +0000
+++ b/sys/dev/pcmcia/if_cnw.c   Tue Oct 17 23:20:53 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cnw.c,v 1.11.2.1 2000/07/07 07:31:29 itojun Exp $   */
+/*     $NetBSD: if_cnw.c,v 1.11.2.2 2000/10/17 23:20:53 tv Exp $       */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -539,15 +539,15 @@
        sc->sc_ioh = sc->sc_pcioh.ioh;
        sc->sc_resource |= CNW_RES_IO;
 #endif
-       if (pcmcia_mem_alloc(sc->sc_pf, CNW_MEM_SIZE, &sc->sc_pcmemh) != 0) {
-               printf(": can't allocate memory\n");
-               goto fail;
-       }
 #ifndef MEMORY_MAPPED
        memsize = CNW_MEM_SIZE;
 #else
        memsize = CNW_MEM_SIZE + CNW_IOM_SIZE;
 #endif
+       if (pcmcia_mem_alloc(sc->sc_pf, memsize, &sc->sc_pcmemh) != 0) {
+               printf(": can't allocate memory\n");
+               goto fail;
+       }
        if (pcmcia_mem_map(sc->sc_pf, PCMCIA_WIDTH_MEM8|PCMCIA_MEM_COMMON,
            CNW_MEM_ADDR, memsize, &sc->sc_pcmemh, &sc->sc_memoff,
            &sc->sc_memwin) != 0) {