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

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

diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 53d8ab54e181167ae54d3da482883f1dcaf23a4b..f700f0e4f2ec4d7c700a2428fd83e54129992c24 100644 (file)
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -782,7 +782,7 @@ static int check_attaching_info(const struct ubi_device *ubi,
  */
 int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *ai)
 {
-       int i, err;
+       int err;
        struct ubi_ainf_volume *av;
 
        empty_vtbl_record.crc = cpu_to_be32(0xf116c36b);
@@ -851,11 +851,7 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *ai)
 
 out_free:
        vfree(ubi->vtbl);
-       for (i = 0; i < ubi->vtbl_slots + UBI_INT_VOL_COUNT; i++) {
-               ubi_fastmap_destroy_checkmap(ubi->volumes[i]);
-               kfree(ubi->volumes[i]);
-               ubi->volumes[i] = NULL;
-       }
+       ubi_free_all_volumes(ubi);
        return err;
 }