From: Heiko Schocher Date: Tue, 20 Jan 2015 08:05:23 +0000 (+0100) Subject: ubi: reset mtd_devs when ubi part fail X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=40da2a2a08f12015d06d78a334e4d977963fee34;p=project%2Fbcm63xx%2Fu-boot.git ubi: reset mtd_devs when ubi part fail if "ubi part" fails, reset also mtd_devs to 0, as further "ubi part" would use wrong mtd_devs. Signed-off-by: Heiko Schocher --- diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 584cf5f22b..290d524b1b 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1358,6 +1358,10 @@ out_version: out_class: class_destroy(ubi_class); out: +#ifdef __UBOOT__ + /* Reset any globals that the driver depends on being zeroed */ + mtd_devs = 0; +#endif ubi_err("cannot initialize UBI, error %d", err); return err; } @@ -1384,6 +1388,10 @@ void ubi_exit(void) misc_deregister(&ubi_ctrl_cdev); class_remove_file(ubi_class, &ubi_version); class_destroy(ubi_class); +#ifdef __UBOOT__ + /* Reset any globals that the driver depends on being zeroed */ + mtd_devs = 0; +#endif } module_exit(ubi_exit);