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

Don't call destroy_dev on the alias. This fixes half a dozen PRs I think.

Browse Source
This commit is contained in:
Warner Losh 2008-12-02 04:54:31 +00:00
parent 8f49dd912a
commit 7d0fb1f7ef
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=185545
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/cardbus/cardbus_device.c
View File

@ -112,15 +112,15 @@ cardbus_device_create(struct cardbus_softc *sc, struct cardbus_devinfo *devi,
device_t parent, device_t child)
{
uint32_t minor;
int unit;
cardbus_device_buffer_cis(parent, child, &devi->sc_cis);
minor = (device_get_unit(sc->sc_dev) << 8) + devi->pci.cfg.func;
unit = device_get_unit(sc->sc_dev);
devi->sc_cisdev = make_dev(&cardbus_cdevsw, minor, 0, 0, 0666,
"cardbus%d.%d.cis", device_get_unit(sc->sc_dev),
devi->pci.cfg.func);
"cardbus%d.%d.cis", unit, devi->pci.cfg.func);
if (devi->pci.cfg.func == 0)
devi->sc_cisdev_compat = make_dev_alias(devi->sc_cisdev,
"cardbus%d.cis", device_get_unit(sc->sc_dev));
make_dev_alias(devi->sc_cisdev, "cardbus%d.cis", unit);
devi->sc_cisdev->si_drv1 = devi;
return (0);
}
@ -130,8 +130,6 @@ cardbus_device_destroy(struct cardbus_devinfo *devi)
{
if (devi->sc_cisdev)
destroy_dev(devi->sc_cisdev);
if (devi->sc_cisdev_compat)
destroy_dev(devi->sc_cisdev_compat);
return (0);
}

1
sys/dev/cardbus/cardbusvar.h
View File

@ -60,7 +60,6 @@ struct cardbus_devinfo
} funce;
uint32_t fepresent; /* bit mask of funce values present */
struct cdev *sc_cisdev;
struct cdev *sc_cisdev_compat;
struct cis_buffer sc_cis;
};