summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorroger <roger@FreeBSD.org>2002-12-09 09:04:09 +0000
committerroger <roger@FreeBSD.org>2002-12-09 09:04:09 +0000
commit27d50786e265d14f9a416b69338426c9112c6fc4 (patch)
treee911b8d95076dcab650c80d9699378e7b53062b6 /sys
parentc5caffe9c429caa50e5fbb079d7ee14257116c62 (diff)
downloadFreeBSD-src-27d50786e265d14f9a416b69338426c9112c6fc4.zip
FreeBSD-src-27d50786e265d14f9a416b69338426c9112c6fc4.tar.gz
Fix a panic unloading the bktr driver when devfs is in use.
PR: kern/36413
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/bktr/bktr_os.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index e26dc33..4aae13c 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -494,20 +494,12 @@ bktr_detach( device_t dev )
/* The memory is retained by the bktr_mem module so we can unload and */
/* then reload the main bktr driver module */
- /* Unregister the /dev/bktrN, tunerN and vbiN devices */
+ /* Unregister the /dev/bktrN, tunerN and vbiN devices,
+ * the aliases for unit 0 are automatically destroyed */
destroy_dev(bktr->vbidev);
destroy_dev(bktr->tunerdev);
destroy_dev(bktr->bktrdev);
- /* If this is unit 0, then destroy the alias entries too */
-#if (__FreeBSD_version >=500000)
- if (unit == 0) {
- destroy_dev(bktr->vbidev_alias);
- destroy_dev(bktr->tunerdev_alias);
- destroy_dev(bktr->bktrdev_alias);
- }
-#endif
-
/*
* Deallocate resources.
*/
OpenPOWER on IntegriCloud