From: Ben Hutchings <ben.hutchings@mind.be>
Date: Wed, 10 Apr 2024 22:42:41 +0000 (+0200)
Subject: mtd: ubi: Restore missing cleanup on ubi_init() failure path
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=72f3d3daddd740f744a24cd7ef8c27bd0cd5489d;p=users%2Fdwmw2%2Flinux.git

mtd: ubi: Restore missing cleanup on ubi_init() failure path

We need to clean-up debugfs and ubiblock if we fail after initialising
them.

Signed-off-by: Ben Hutchings <ben.hutchings@mind.be>
Fixes: 927c145208b0 ("mtd: ubi: attach from device tree")
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 952c80269f570..30be4ed68fad2 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1372,7 +1372,7 @@ static int __init ubi_init(void)
 
 		/* See comment above re-ubi_is_module(). */
 		if (ubi_is_module())
-			goto out_slab;
+			goto out_debugfs;
 	}
 
 	register_mtd_user(&ubi_mtd_notifier);
@@ -1387,6 +1387,9 @@ static int __init ubi_init(void)
 
 out_mtd_notifier:
 	unregister_mtd_user(&ubi_mtd_notifier);
+	ubiblock_exit();
+out_debugfs:
+	ubi_debugfs_exit();
 out_slab:
 	kmem_cache_destroy(ubi_wl_entry_slab);
 out_dev_unreg: