From 1b239080820fb6513df001f7190e956807639b15 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 4 Apr 2000 04:12:43 +0000 Subject: [PATCH] Fix pcic_detach_socket to get right pcic_handle. Pass sc->dev rather than a bogusly cast pccard_softc *sc. This allows us to insert and remove cards w/o panicing the kernel. However, the cis isn't mapped in, so the pccard_scan_cis function fails. --- sys/dev/pccard/pccard_cis.c | 2 +- sys/dev/pcic/i82365.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c index 779763d16497..344d26b1fd62 100644 --- a/sys/dev/pccard/pccard_cis.c +++ b/sys/dev/pccard/pccard_cis.c @@ -92,7 +92,7 @@ pccard_read_cis(struct pccard_softc *sc) state.pf = NULL; - if (pccard_scan_cis((struct device *)sc, pccard_parse_cis_tuple, + if (pccard_scan_cis(sc->dev, pccard_parse_cis_tuple, &state) == -1) state.card->error++; } diff --git a/sys/dev/pcic/i82365.c b/sys/dev/pcic/i82365.c index 265d2902c59e..2e270776ac4b 100644 --- a/sys/dev/pcic/i82365.c +++ b/sys/dev/pcic/i82365.c @@ -1299,7 +1299,7 @@ pcic_enable_socket(device_t dev, device_t child) int pcic_disable_socket(device_t dev, device_t child) { - struct pcic_handle *h = NULL; /* XXXIMPXXX */ + struct pcic_handle *h = pcic_get_handle(dev, child); DPRINTF(("pcic_chip_socket_disable\n")); /* power down the socket */