diff options
| author | Joe Perches <joe@perches.com> | 2011-05-28 10:36:26 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 13:55:03 +0200 |
| commit | 1ac4594d88f63ba1557cc1a30ec1f915ca55b7cb (patch) | |
| tree | 53dbcfcf17b0b40c18fdb6aeb8c181f665f82a99 | |
| parent | 8e03bd6525d3281068519d5f6059cdcc5a67af66 (diff) | |
| download | linux-3.10-1ac4594d88f63ba1557cc1a30ec1f915ca55b7cb.tar.gz linux-3.10-1ac4594d88f63ba1557cc1a30ec1f915ca55b7cb.tar.bz2 linux-3.10-1ac4594d88f63ba1557cc1a30ec1f915ca55b7cb.zip | |
isdn: Convert vmalloc/memset to vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 4 | ||||
| -rw-r--r-- | drivers/isdn/mISDN/dsp_core.c | 3 | ||||
| -rw-r--r-- | drivers/isdn/mISDN/l1oip_codec.c | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 6ed82add6ff..6ddb795e31c 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c @@ -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); diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 2877291a9ed..0c41553ce68 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c @@ -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__); diff --git a/drivers/isdn/mISDN/l1oip_codec.c b/drivers/isdn/mISDN/l1oip_codec.c index bbfd1b863ed..5a89972624d 100644 --- a/drivers/isdn/mISDN/l1oip_codec.c +++ b/drivers/isdn/mISDN/l1oip_codec.c @@ -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) { |