Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24b9bdff authored by Ivan Bornyakov's avatar Ivan Bornyakov Committed by Greg Kroah-Hartman
Browse files

staging: gasket: use vzalloc instead of vmalloc/memset 



Use vzalloc instead of vmalloc followed by memset with 0.

Signed-off-by: default avatarIvan Bornyakov <brnkv.i1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent afa9e318

drivers/staging/gasket/gasket_page_table.c

+2 −4
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ int gasket_page_table_init( 
	pg_tbl = *ppg_tbl;

	bytes = total_entries * sizeof(struct gasket_page_table_entry);

	if (bytes != 0) {

		pg_tbl->entries = vmalloc(bytes);

		pg_tbl->entries = vzalloc(bytes);

		if (!pg_tbl->entries) {

			gasket_nodev_debug(

				"No memory for address translation metadata.");
@@ -338,7 +338,6 @@ int gasket_page_table_init( 
			*ppg_tbl = NULL;

			return -ENOMEM;

		}

		memset(pg_tbl->entries, 0, bytes);

	}



	mutex_init(&pg_tbl->mutex);
@@ -1054,13 +1053,12 @@ static int gasket_alloc_extended_subtable( 


	subtable_bytes = sizeof(struct gasket_page_table_entry) *

		GASKET_PAGES_PER_SUBTABLE;

	pte->sublevel = vmalloc(subtable_bytes);

	pte->sublevel = vzalloc(subtable_bytes);

	if (!pte->sublevel) {

		free_page(page_addr);

		memset(pte, 0, sizeof(struct gasket_page_table_entry));

		return -ENOMEM;

	}

	memset(pte->sublevel, 0, subtable_bytes);



	/* Map the page into DMA space. */

	if (pg_tbl->dma_ops) {