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

Commit 1ac4594d authored by Joe Perches's avatar Joe Perches Committed by Jiri Kosina
Browse files

isdn: Convert vmalloc/memset to vzalloc 



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

drivers/isdn/i4l/isdn_common.c

+2 −2
Original line number Diff line number Diff line
@@ -2308,11 +2308,11 @@ static int __init isdn_init(void) 
	int i;

	char tmprev[50];



	if (!(dev = vmalloc(sizeof(isdn_dev)))) {

	dev = vzalloc(sizeof(isdn_dev));

	if (!dev) {

		printk(KERN_WARNING "isdn: Could not allocate device-struct.\n");

		return -EIO;

	}

	memset((char *) dev, 0, sizeof(isdn_dev));

	init_timer(&dev->timer);

	dev->timer.function = isdn_timer_funct;

	spin_lock_init(&dev->lock);

drivers/isdn/mISDN/dsp_core.c

+1 −2
Original line number Diff line number Diff line
@@ -1052,12 +1052,11 @@ dspcreate(struct channel_req *crq) 
	if (crq->protocol != ISDN_P_B_L2DSP

	 && crq->protocol != ISDN_P_B_L2DSPHDLC)

		return -EPROTONOSUPPORT;

	ndsp = vmalloc(sizeof(struct dsp));

	ndsp = vzalloc(sizeof(struct dsp));

	if (!ndsp) {

		printk(KERN_ERR "%s: vmalloc struct dsp failed\n", __func__);

		return -ENOMEM;

	}

	memset(ndsp, 0, sizeof(struct dsp));

	if (dsp_debug & DEBUG_DSP_CTRL)

		printk(KERN_DEBUG "%s: creating new dsp instance\n", __func__);

drivers/isdn/mISDN/l1oip_codec.c

+2 −4
Original line number Diff line number Diff line
@@ -330,14 +330,12 @@ l1oip_4bit_alloc(int ulaw) 
		return 0;



	/* alloc conversion tables */

	table_com = vmalloc(65536);

	table_dec = vmalloc(512);

	table_com = vzalloc(65536);

	table_dec = vzalloc(512);

	if (!table_com || !table_dec) {

		l1oip_4bit_free();

		return -ENOMEM;

	}

	memset(table_com, 0, 65536);

	memset(table_dec, 0, 512);

	/* generate compression table */

	i1 = 0;

	while (i1 < 256) {