summaryrefslogtreecommitdiff
path: root/fs/ubifs/super.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-10-12 20:44:36 (GMT)
committerWolfgang Denk <wd@denx.de>2011-10-12 20:44:36 (GMT)
commitf6d99aa9471bd5aa396d28bb3709162523cc4adb (patch)
tree5c3a3f5ac3ce6b072c0625f255c057ba7ee523ff /fs/ubifs/super.c
parente5a07171767115b446fb5070e9c0293fd1190c03 (diff)
parentd63894654df72b010de2abb4b3f07d0d755f65b6 (diff)
downloadu-boot-f6d99aa9471bd5aa396d28bb3709162523cc4adb.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-ubi
* 'master' of git://git.denx.de/u-boot-ubi: UBI: init eba tables before wl when attaching a device ubifs bad superblock bug
Diffstat (limited to 'fs/ubifs/super.c')
-rw-r--r--fs/ubifs/super.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 63b2164..26b48f0 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -848,8 +848,10 @@ void ubifs_umount(struct ubifs_info *c)
ubifs_debugging_exit(c);
/* Finally free U-Boot's global copy of superblock */
- free(ubifs_sb->s_fs_info);
- free(ubifs_sb);
+ if (ubifs_sb != NULL) {
+ free(ubifs_sb->s_fs_info);
+ free(ubifs_sb);
+ }
}
/**