Commit 309b5e4e authored by Joe Perches's avatar Joe Perches Committed by David Woodhouse
Browse files

mtd: use vzalloc 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 08b3af30

drivers/mtd/nand/nandsim.c

+1 −2
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int alloc_device(struct nandsim *ns) 
			err = -EINVAL;

			goto err_close;

		}

		ns->pages_written = vmalloc(ns->geom.pgnum);

		ns->pages_written = vzalloc(ns->geom.pgnum);

		if (!ns->pages_written) {

			NS_ERR("alloc_device: unable to allocate pages written array\n");

			err = -ENOMEM;
@@ -483,7 +483,6 @@ static int alloc_device(struct nandsim *ns) 
			goto err_free;

		}

		ns->cfile = cfile;

		memset(ns->pages_written, 0, ns->geom.pgnum);

		return 0;

	}

drivers/mtd/ubi/vtbl.c

+2 −4
Original line number Diff line number Diff line
@@ -425,12 +425,11 @@ static struct ubi_vtbl_record *process_lvol(struct ubi_device *ubi, 


	/* Read both LEB 0 and LEB 1 into memory */

	ubi_rb_for_each_entry(rb, seb, &sv->root, u.rb) {

		leb[seb->lnum] = vmalloc(ubi->vtbl_size);

		leb[seb->lnum] = vzalloc(ubi->vtbl_size);

		if (!leb[seb->lnum]) {

			err = -ENOMEM;

			goto out_free;

		}

		memset(leb[seb->lnum], 0, ubi->vtbl_size);



		err = ubi_io_read_data(ubi, leb[seb->lnum], seb->pnum, 0,

				       ubi->vtbl_size);
@@ -516,10 +515,9 @@ static struct ubi_vtbl_record *create_empty_lvol(struct ubi_device *ubi, 
	int i;

	struct ubi_vtbl_record *vtbl;



	vtbl = vmalloc(ubi->vtbl_size);

	vtbl = vzalloc(ubi->vtbl_size);

	if (!vtbl)

		return ERR_PTR(-ENOMEM);

	memset(vtbl, 0, ubi->vtbl_size);



	for (i = 0; i < ubi->vtbl_slots; i++)

		memcpy(&vtbl[i], &empty_vtbl_record, UBI_VTBL_RECORD_SIZE);