From 7db8b7131b53951da1a66353a2cbe45761e2f74f Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sat, 28 May 2011 10:36:26 -0700
Subject: [PATCH] --- yaml --- r: 264799 b: refs/heads/master c:
 1ac4594d88f63ba1557cc1a30ec1f915ca55b7cb h: refs/heads/master i:   264797:
 52a6f39697c151716ce541f578fdc1acea3f28e0   264795:
 d12c2dfb6232586ddc4e10747e78d44aa73be3fd   264791:
 367bd8c3e53c0655ed62a5fa9478e81fc585f27a   264783:
 5c188e9b45e6ef117f8e819970119f815498d89f   264767:
 3fb005a545a81f5f783e0cdae5b5f3e859fa7ef5 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/isdn/i4l/isdn_common.c   | 4 ++--
 trunk/drivers/isdn/mISDN/dsp_core.c    | 3 +--
 trunk/drivers/isdn/mISDN/l1oip_codec.c | 6 ++----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 415c190e5b6b..19cfccd02aa6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e03bd6525d3281068519d5f6059cdcc5a67af66
+refs/heads/master: 1ac4594d88f63ba1557cc1a30ec1f915ca55b7cb
diff --git a/trunk/drivers/isdn/i4l/isdn_common.c b/trunk/drivers/isdn/i4l/isdn_common.c
index 6ed82add6ffa..6ddb795e31c5 100644
--- a/trunk/drivers/isdn/i4l/isdn_common.c
+++ b/trunk/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/trunk/drivers/isdn/mISDN/dsp_core.c b/trunk/drivers/isdn/mISDN/dsp_core.c
index 2877291a9ed8..0c41553ce684 100644
--- a/trunk/drivers/isdn/mISDN/dsp_core.c
+++ b/trunk/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/trunk/drivers/isdn/mISDN/l1oip_codec.c b/trunk/drivers/isdn/mISDN/l1oip_codec.c
index bbfd1b863ed3..5a89972624d8 100644
--- a/trunk/drivers/isdn/mISDN/l1oip_codec.c
+++ b/trunk/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) {