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

Commit 5b84cc78 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: Use vzalloc 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4eb28f71

drivers/staging/comedi/drivers.c

+1 −3
Original line number Diff line number Diff line
@@ -470,10 +470,8 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, 
		struct page **pages = NULL;



		async->buf_page_list =

		    vmalloc(sizeof(struct comedi_buf_page) * n_pages);

		    vzalloc(sizeof(struct comedi_buf_page) * n_pages);

		if (async->buf_page_list) {

			memset(async->buf_page_list, 0,

			       sizeof(struct comedi_buf_page) * n_pages);

			pages = vmalloc(sizeof(struct page *) * n_pages);

		}

		if (pages) {

drivers/staging/rtl8192e/r8192E_core.c

+1 −3
Original line number Diff line number Diff line
@@ -2283,9 +2283,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev) 
				IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER);



	priv->AcmControl = 0;

	priv->pFirmware = (rt_firmware*)vmalloc(sizeof(rt_firmware));

	if (priv->pFirmware)

	memset(priv->pFirmware, 0, sizeof(rt_firmware));

	priv->pFirmware = vzalloc(sizeof(rt_firmware));



	/* rx related queue */

        skb_queue_head_init(&priv->rx_queue);

drivers/staging/udlfb/udlfb.c

+2 −3
Original line number Diff line number Diff line
@@ -1163,14 +1163,13 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info) 
		 * But with imperfect damage info we may send pixels over USB

		 * that were, in fact, unchanged - wasting limited USB bandwidth

		 */

		new_back = vmalloc(new_len);

		new_back = vzalloc(new_len);

		if (!new_back)

			dl_info("No shadow/backing buffer allcoated\n");

			dl_info("No shadow/backing buffer allocated\n");

		else {

			if (dev->backing_buffer)

				vfree(dev->backing_buffer);

			dev->backing_buffer = new_back;

			memset(dev->backing_buffer, 0, new_len);

		}

	}

drivers/staging/xgifb/XGI_main_26.c

+1 −2
Original line number Diff line number Diff line
@@ -2180,8 +2180,7 @@ static int XGIfb_heap_init(void) 


#ifndef AGPOFF

	if (XGIfb_queuemode == AGP_CMD_QUEUE) {

		agp_info = vmalloc(sizeof(*agp_info));

		memset((void *)agp_info, 0x00, sizeof(*agp_info));

		agp_info = vzalloc(sizeof(*agp_info));

		agp_copy_info(agp_info);



		agp_backend_acquire();

drivers/staging/zram/zram_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ int zram_init_device(struct zram *zram) 
	}



	num_pages = zram->disksize >> PAGE_SHIFT;

	zram->table = vmalloc(num_pages * sizeof(*zram->table));

	zram->table = vzalloc(num_pages * sizeof(*zram->table));

	if (!zram->table) {

		pr_err("Error allocating zram address table\n");

		/* To prevent accessing table entries during cleanup */
@@ -541,7 +541,6 @@ int zram_init_device(struct zram *zram) 
		ret = -ENOMEM;

		goto fail;

	}

	memset(zram->table, 0, num_pages * sizeof(*zram->table));



	set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);