From 68862a0a68c46858a2e31a712545ad97db38521f Mon Sep 17 00:00:00 2001 From: wpaul Date: Thu, 2 Nov 2000 00:00:30 +0000 Subject: Fix a couple of cases where I tried to release the I/O space resource twice (once as as an I/O space resource and once as an IRQ resource). There was a problem with this in if_rl too, which is how I found it. --- sys/pci/if_sis.c | 2 +- sys/pci/if_sk.c | 2 +- sys/pci/if_tl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/pci') diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index 5de1eb4..d59c99c 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -725,7 +725,7 @@ static int sis_attach(dev) sis_intr, sc, &sc->sis_intrhand); if (error) { - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sis_res); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sis_irq); bus_release_resource(dev, SIS_RES, SIS_RID, sc->sis_res); printf("sis%d: couldn't set up irq\n", unit); goto fail; diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c index bb0c414..b2ee64a 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -1275,7 +1275,7 @@ static int sk_attach(dev) if (error) { printf("skc%d: couldn't set up irq\n", unit); bus_release_resource(dev, SK_RES, SK_RID, sc->sk_res); - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sk_res); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sk_irq); goto fail; } diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c index b873597..c109e81 100644 --- a/sys/pci/if_tl.c +++ b/sys/pci/if_tl.c @@ -1214,7 +1214,7 @@ static int tl_attach(dev) tl_intr, sc, &sc->tl_intrhand); if (error) { - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->tl_res); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->tl_irq); bus_release_resource(dev, TL_RES, TL_RID, sc->tl_res); printf("tl%d: couldn't set up irq\n", unit); goto fail; -- cgit v1.1