1 files changed, 26 insertions, 2 deletions

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 65626c1c446d..6c3fb5ab20f5 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -953,10 +953,14 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset)
         if (!ubi->peb_buf2)
                 goto out_free;
 
+        err = ubi_debugging_init_dev(ubi);
+        if (err)
+                goto out_free;
+
         err = attach_by_scanning(ubi);
         if (err) {
                 dbg_err("failed to attach by scanning, error %d", err);
-                goto out_free;
+                goto out_debugging;
         }
 
         if (ubi->autoresize_vol_id != -1) {
@@ -969,12 +973,16 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset)
         if (err)
                 goto out_detach;
 
+        err = ubi_debugfs_init_dev(ubi);
+        if (err)
+                goto out_uif;
+
         ubi->bgt_thread = kthread_create(ubi_thread, ubi, ubi->bgt_name);
         if (IS_ERR(ubi->bgt_thread)) {
                 err = PTR_ERR(ubi->bgt_thread);
                 ubi_err("cannot spawn \"%s\", error %d", ubi->bgt_name,
                         err);
-                goto out_uif;
+                goto out_debugfs;
         }
 
         ubi_msg("attached mtd%d to ubi%d", mtd->index, ubi_num);
@@ -1008,12 +1016,18 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset)
         ubi_notify_all(ubi, UBI_VOLUME_ADDED, NULL);
         return ubi_num;
 
+out_debugfs:
+        ubi_debugfs_exit_dev(ubi);
 out_uif:
+        get_device(&ubi->dev);
+        ubi_assert(ref);
         uif_close(ubi);
 out_detach:
         ubi_wl_close(ubi);
         free_internal_volumes(ubi);
         vfree(ubi->vtbl);
+out_debugging:
+        ubi_debugging_exit_dev(ubi);
 out_free:
         vfree(ubi->peb_buf1);
         vfree(ubi->peb_buf2);
@@ -1080,11 +1094,13 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)
          */
         get_device(&ubi->dev);
 
+        ubi_debugfs_exit_dev(ubi);
         uif_close(ubi);
         ubi_wl_close(ubi);
         free_internal_volumes(ubi);
         vfree(ubi->vtbl);
         put_mtd_device(ubi->mtd);
+        ubi_debugging_exit_dev(ubi);
         vfree(ubi->peb_buf1);
         vfree(ubi->peb_buf2);
         ubi_msg("mtd%d is detached from ubi%d", ubi->mtd->index, ubi->ubi_num);
@@ -1199,6 +1215,11 @@ static int __init ubi_init(void)
         if (!ubi_wl_entry_slab)
                 goto out_dev_unreg;
 
+        err = ubi_debugfs_init();
+        if (err)
+                goto out_slab;
+
+
         /* Attach MTD devices */
         for (i = 0; i < mtd_devs; i++) {
                 struct mtd_dev_param *p = &mtd_dev_param[i];
@@ -1247,6 +1268,8 @@ out_detach:
                         ubi_detach_mtd_dev(ubi_devices[k]->ubi_num, 1);
                         mutex_unlock(&ubi_devices_mutex);
                 }
+        ubi_debugfs_exit();
+out_slab:
         kmem_cache_destroy(ubi_wl_entry_slab);
 out_dev_unreg:
         misc_deregister(&ubi_ctrl_cdev);
@@ -1270,6 +1293,7 @@ static void __exit ubi_exit(void)
                         ubi_detach_mtd_dev(ubi_devices[i]->ubi_num, 1);
                         mutex_unlock(&ubi_devices_mutex);
                 }
+        ubi_debugfs_exit();
         kmem_cache_destroy(ubi_wl_entry_slab);
         misc_deregister(&ubi_ctrl_cdev);
         class_remove_file(ubi_class, &ubi_version);