mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-04 18:40:42 +09:00
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
This commit is contained in:
commit
f6d99aa947
@ -476,21 +476,21 @@ static int attach_by_scanning(struct ubi_device *ubi)
|
|||||||
if (err)
|
if (err)
|
||||||
goto out_si;
|
goto out_si;
|
||||||
|
|
||||||
err = ubi_wl_init_scan(ubi, si);
|
|
||||||
if (err)
|
|
||||||
goto out_vtbl;
|
|
||||||
|
|
||||||
err = ubi_eba_init_scan(ubi, si);
|
err = ubi_eba_init_scan(ubi, si);
|
||||||
if (err)
|
if (err)
|
||||||
goto out_wl;
|
goto out_wl;
|
||||||
|
|
||||||
|
err = ubi_wl_init_scan(ubi, si);
|
||||||
|
if (err)
|
||||||
|
goto out_vtbl;
|
||||||
|
|
||||||
ubi_scan_destroy_si(si);
|
ubi_scan_destroy_si(si);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_wl:
|
|
||||||
ubi_wl_close(ubi);
|
|
||||||
out_vtbl:
|
out_vtbl:
|
||||||
vfree(ubi->vtbl);
|
vfree(ubi->vtbl);
|
||||||
|
out_wl:
|
||||||
|
ubi_wl_close(ubi);
|
||||||
out_si:
|
out_si:
|
||||||
ubi_scan_destroy_si(si);
|
ubi_scan_destroy_si(si);
|
||||||
return err;
|
return err;
|
||||||
|
@ -848,8 +848,10 @@ void ubifs_umount(struct ubifs_info *c)
|
|||||||
ubifs_debugging_exit(c);
|
ubifs_debugging_exit(c);
|
||||||
|
|
||||||
/* Finally free U-Boot's global copy of superblock */
|
/* Finally free U-Boot's global copy of superblock */
|
||||||
free(ubifs_sb->s_fs_info);
|
if (ubifs_sb != NULL) {
|
||||||
free(ubifs_sb);
|
free(ubifs_sb->s_fs_info);
|
||||||
|
free(ubifs_sb);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user