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

Use the correct minor number for the pccardX.cis device.

Browse Source 
Don't destroy a NULL device.

This should fix the panics on boot people are seeing on systems with
more than one pccard slot.
This commit is contained in:
Warner Losh 2005-09-20 23:48:06 +00:00
parent 749474f2f5
commit 3896edc1d9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/pccard/pccard_device.c
View File

@ -61,8 +61,11 @@ static struct cdevsw pccard_cdevsw = {
int
pccard_device_create(struct pccard_softc *sc)
{
sc->cisdev = make_dev(&pccard_cdevsw, 0, 0, 0, 0666, "pccard%u.cis",
device_get_unit(sc->dev));
uint32_t minor;
minor = device_get_unit(sc->dev) << 16;
sc->cisdev = make_dev(&pccard_cdevsw, minor, 0, 0, 0666,
"pccard%u.cis", device_get_unit(sc->dev));
sc->cisdev->si_drv1 = sc;
return (0);
}
@ -70,7 +73,8 @@ pccard_device_create(struct pccard_softc *sc)
int
pccard_device_destroy(struct pccard_softc *sc)
{
destroy_dev(sc->cisdev);
if (sc->cisdev)
destroy_dev(sc->cisdev);
return (0);
}