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

Commit 3a816054 authored by Joe Perches's avatar Joe Perches Committed by Jiri Kosina
Browse files

atm: Convert vmalloc/memset to vzalloc 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent dc8a5c99

drivers/atm/idt77252.c

+6 −5
Original line number Diff line number Diff line
@@ -3416,27 +3416,28 @@ init_card(struct atm_dev *dev) 


	size = sizeof(struct vc_map *) * card->tct_size;

	IPRINTK("%s: allocate %d byte for VC map.\n", card->name, size);

	if (NULL == (card->vcs = vmalloc(size))) {

	card->vcs = vzalloc(size);

	if (!card->vcs) {

		printk("%s: memory allocation failure.\n", card->name);

		deinit_card(card);

		return -1;

	}

	memset(card->vcs, 0, size);



	size = sizeof(struct vc_map *) * card->scd_size;

	IPRINTK("%s: allocate %d byte for SCD to VC mapping.\n",

	        card->name, size);

	if (NULL == (card->scd2vc = vmalloc(size))) {

	card->scd2vc = vzalloc(size);

	if (!card->scd2vc) {

		printk("%s: memory allocation failure.\n", card->name);

		deinit_card(card);

		return -1;

	}

	memset(card->scd2vc, 0, size);



	size = sizeof(struct tst_info) * (card->tst_size - 2);

	IPRINTK("%s: allocate %d byte for TST to VC mapping.\n",

		card->name, size);

	if (NULL == (card->soft_tst = vmalloc(size))) {

	card->soft_tst = vmalloc(size);

	if (!card->soft_tst) {

		printk("%s: memory allocation failure.\n", card->name);

		deinit_card(card);

		return -1;

drivers/atm/lanai.c

+1 −2
Original line number Diff line number Diff line
@@ -1457,10 +1457,9 @@ static int __devinit vcc_table_allocate(struct lanai_dev *lanai) 
	return (lanai->vccs == NULL) ? -ENOMEM : 0;

#else

	int bytes = (lanai->num_vci) * sizeof(struct lanai_vcc *);

	lanai->vccs = (struct lanai_vcc **) vmalloc(bytes);

	lanai->vccs = vzalloc(bytes);

	if (unlikely(lanai->vccs == NULL))

		return -ENOMEM;

	memset(lanai->vccs, 0, bytes);

	return 0;

#endif

}