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));