Merge branch 'master' of git://git.denx.de/u-boot-i2c

diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 507b09172069f62ac621b0322c551ad3610f3081..e823ca56f23a723444c8af6dc494267a355cf418 100644 (file)
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1528,6 +1528,7 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
                INIT_LIST_HEAD(&ubi->pq[i]);
        ubi->pq_head = 0;
 
+       ubi->free_count = 0;
        list_for_each_entry_safe(aeb, tmp, &ai->erase, u.list) {
                cond_resched();
 
@@ -1546,7 +1547,6 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
                found_pebs++;
        }
 
-       ubi->free_count = 0;
        list_for_each_entry(aeb, &ai->free, u.list) {
                cond_resched();
 

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index dcf3a479479d6e786462ff9af60b807a5288117d..effa8d933fe9d0db7d7b91085e39e826f3b4f804 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -48,7 +48,6 @@ struct vfsmount;
 #define INODE_LOCKED_MAX       64
 
 struct super_block *ubifs_sb;
-LIST_HEAD(super_blocks);
 
 static struct inode *inodes_locked_down[INODE_LOCKED_MAX];
 
@@ -2425,10 +2424,10 @@ retry:
        s->s_type = type;
 #ifndef __UBOOT__
        strlcpy(s->s_id, type->name, sizeof(s->s_id));
+       list_add_tail(&s->s_list, &super_blocks);
 #else
        strncpy(s->s_id, type->name, sizeof(s->s_id));
 #endif
-       list_add_tail(&s->s_list, &super_blocks);
        hlist_add_head(&s->s_instances, &type->fs_supers);
 #ifndef __UBOOT__
        spin_unlock(&sb_lock);