From b94193dfc1b82254a7ec9c3176da3fc7ad9fa4d7 Mon Sep 17 00:00:00 2001 From: Noriaki Mitsunaga Date: Sun, 25 Feb 2001 14:01:46 +0000 Subject: [PATCH] o Check the size of I/O window handed by parent bus. --- sys/dev/stg/tmc18c30_pccard.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c index 7798b488dc4..fb3cd0de235 100644 --- a/sys/dev/stg/tmc18c30_pccard.c +++ b/sys/dev/stg/tmc18c30_pccard.c @@ -138,12 +138,17 @@ static int stg_alloc_resource(DEVPORT_PDEVICE dev) { struct stg_softc *sc = device_get_softc(dev); - u_long maddr, msize; + u_long ioaddr, iosize, maddr, msize; int error; + error = bus_get_resource(dev, SYS_RES_IOPORT, 0, &ioaddr, &iosize); + if (error || iosize < STGIOSZ) { + return(ENOMEM); + } + sc->port_rid = 0; sc->port_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->port_rid, - 0, ~0, STGIOSZ, RF_ACTIVE); + 0, ~0, 0, RF_ACTIVE); if (sc->port_res == NULL) { stg_release_resource(dev); return(ENOMEM);