From 7d32e0d06d40051519ed331f177e892378a62450 Mon Sep 17 00:00:00 2001
From: Devendra Naga <develkernel412222@gmail.com>
Date: Sat, 4 Aug 2012 14:12:21 -0300
Subject: [PATCH] --- yaml --- r: 330771 b: refs/heads/master c:
 ada3678c6a9a0c404acf15e98679315b29689b73 h: refs/heads/master i:   330769:
 fb35209b7f15bb9b81e38eabb2e6b49129921f74   330767:
 a4632957d8797ea6f8a65ea2d904a08dc6b63790 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/media/cxd2099/cxd2099.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 59b9a0971e54..eb1cd9ad559b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aff355cd51378b6e9ca8c0a3961571ebafd1367
+refs/heads/master: ada3678c6a9a0c404acf15e98679315b29689b73
diff --git a/trunk/drivers/staging/media/cxd2099/cxd2099.c b/trunk/drivers/staging/media/cxd2099/cxd2099.c
index 16785032ac8c..4f2235f2153d 100644
--- a/trunk/drivers/staging/media/cxd2099/cxd2099.c
+++ b/trunk/drivers/staging/media/cxd2099/cxd2099.c
@@ -691,10 +691,9 @@ struct dvb_ca_en50221 *cxd2099_attach(struct cxd2099_cfg *cfg,
 		return NULL;
 	}
 
-	ci = kmalloc(sizeof(struct cxd), GFP_KERNEL);
+	ci = kzalloc(sizeof(struct cxd), GFP_KERNEL);
 	if (!ci)
 		return NULL;
-	memset(ci, 0, sizeof(*ci));
 
 	mutex_init(&ci->lock);
 	memcpy(&ci->cfg, cfg, sizeof(struct cxd2099_cfg));