summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/dahdi/dahdi-base.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index f9c011d..c597c2b 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -7668,6 +7668,12 @@ static int __init dahdi_init(void) {
static void __exit dahdi_cleanup(void) {
int x;
+ class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 253)); /* timer */
+ class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 254)); /* channel */
+ class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 255)); /* pseudo */
+ class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 0)); /* ctl */
+ class_destroy(dahdi_class);
+
unregister_chrdev(DAHDI_MAJOR, "dahdi");
#ifdef CONFIG_PROC_FS
@@ -7680,14 +7686,6 @@ static void __exit dahdi_cleanup(void) {
kfree(tone_zones[x]);
}
- class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 253)); /* timer */
- class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 254)); /* channel */
- class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 255)); /* pseudo */
- class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 0)); /* ctl */
- class_destroy(dahdi_class);
-
- unregister_chrdev(DAHDI_MAJOR, "dahdi");
-
#ifdef CONFIG_DAHDI_WATCHDOG
watchdog_cleanup();
#endif