diff options
author | Tom Rini <trini@ti.com> | 2015-02-04 13:30:00 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-02-04 13:30:00 -0500 |
commit | 7f641d53bbb3a426a3bfb132d8346153e86a9d08 (patch) | |
tree | e59a0aef74c8742a30a611342d39d7bfe06854dd /drivers/mtd | |
parent | 112db9407dd338f71200beb0fc99dffa8dcb57a8 (diff) | |
parent | 040cc7b3beedecd971274a065564e39aac7fc76e (diff) | |
download | u-boot-imx-7f641d53bbb3a426a3bfb132d8346153e86a9d08.zip u-boot-imx-7f641d53bbb3a426a3bfb132d8346153e86a9d08.tar.gz u-boot-imx-7f641d53bbb3a426a3bfb132d8346153e86a9d08.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/ubi/build.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 584cf5f..290d524 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); |