d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pcic_detach_socket to get right pcic_handle.

Browse Source 
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.
This commit is contained in:
Warner Losh 2000-04-04 04:12:43 +00:00
parent 0d1337c6fa
commit 1b23908082
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/pccard/pccard_cis.c
View File

@ -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++;
}

2
sys/dev/pcic/i82365.c
View File

@ -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 */