Merge tag 'vfio-v5.6-rc1' of git://github.com/awilliam/linux-vfio

[linux.git] / drivers / mtd / ubi / fastmap.c

diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 1c7be4eb3ba629934b5aa4c1e6513c71bdb7c3c3..53f448e7433a9f024132bd22b0f05a698d8be5cf 100644 (file)
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -64,7 +64,7 @@ static int self_check_seen(struct ubi_device *ubi, unsigned long *seen)
                return 0;
 
        for (pnum = 0; pnum < ubi->peb_count; pnum++) {
-               if (test_bit(pnum, seen) && ubi->lookuptbl[pnum]) {
+               if (!test_bit(pnum, seen) && ubi->lookuptbl[pnum]) {
                        ubi_err(ubi, "self-check failed for PEB %d, fastmap didn't see it", pnum);
                        ret = -EINVAL;
                }
@@ -1137,7 +1137,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
        struct rb_node *tmp_rb;
        int ret, i, j, free_peb_count, used_peb_count, vol_count;
        int scrub_peb_count, erase_peb_count;
-       unsigned long *seen_pebs = NULL;
+       unsigned long *seen_pebs;
 
        fm_raw = ubi->fm_buf;
        memset(ubi->fm_buf, 0, ubi->fm_size);
@@ -1151,7 +1151,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
        dvbuf = new_fm_vbuf(ubi, UBI_FM_DATA_VOLUME_ID);
        if (!dvbuf) {
                ret = -ENOMEM;
-               goto out_kfree;
+               goto out_free_avbuf;
        }
 
        avhdr = ubi_get_vid_hdr(avbuf);
@@ -1160,7 +1160,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
        seen_pebs = init_seen(ubi);
        if (IS_ERR(seen_pebs)) {
                ret = PTR_ERR(seen_pebs);
-               goto out_kfree;
+               goto out_free_dvbuf;
        }
 
        spin_lock(&ubi->volumes_lock);
@@ -1328,7 +1328,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
        ret = ubi_io_write_vid_hdr(ubi, new_fm->e[0]->pnum, avbuf);
        if (ret) {
                ubi_err(ubi, "unable to write vid_hdr to fastmap SB!");
-               goto out_kfree;
+               goto out_free_seen;
        }
 
        for (i = 0; i < new_fm->used_blocks; i++) {
@@ -1350,7 +1350,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
                if (ret) {
                        ubi_err(ubi, "unable to write vid_hdr to PEB %i!",
                                new_fm->e[i]->pnum);
-                       goto out_kfree;
+                       goto out_free_seen;
                }
        }
 
@@ -1360,7 +1360,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
                if (ret) {
                        ubi_err(ubi, "unable to write fastmap to PEB %i!",
                                new_fm->e[i]->pnum);
-                       goto out_kfree;
+                       goto out_free_seen;
                }
        }
 
@@ -1370,10 +1370,13 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
        ret = self_check_seen(ubi, seen_pebs);
        dbg_bld("fastmap written!");
 
-out_kfree:
-       ubi_free_vid_buf(avbuf);
-       ubi_free_vid_buf(dvbuf);
+out_free_seen:
        free_seen(seen_pebs);
+out_free_dvbuf:
+       ubi_free_vid_buf(dvbuf);
+out_free_avbuf:
+       ubi_free_vid_buf(avbuf);
+
 out:
        return ret;
 }