1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 7b4af519e17e..b831f08e2769 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2901,9 +2901,6 @@ static int __init comedi_init(void)
 
         comedi_class->dev_groups = comedi_dev_groups;
 
-        /* XXX requires /proc interface */
-        comedi_proc_init();
-
         /* create devices files for legacy/manual use */
         for (i = 0; i < comedi_num_legacy_minors; i++) {
                 struct comedi_device *dev;
@@ -2911,6 +2908,7 @@ static int __init comedi_init(void)
                 dev = comedi_alloc_board_minor(NULL);
                 if (IS_ERR(dev)) {
                         comedi_cleanup_board_minors();
+                        class_destroy(comedi_class);
                         cdev_del(&comedi_cdev);
                         unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
                                                  COMEDI_NUM_MINORS);
@@ -2920,6 +2918,9 @@ static int __init comedi_init(void)
                 mutex_unlock(&dev->mutex);
         }
 
+        /* XXX requires /proc interface */
+        comedi_proc_init();
+
         return 0;
 }
 module_init(comedi_init);