diff --git a/[refs] b/[refs]
index 7592ecb1f342..1bc1def0cd9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1840c15b0a504fed6ee08b475245a964336b76e6
+refs/heads/master: 2f4813163639f9f528c41d98ea52dcc85f8d9781
diff --git a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
index 874919cf5965..10af47700efb 100644
--- a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
+++ b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
@@ -120,11 +120,10 @@ static int ft1000_attach(struct pcmcia_device *link)
 
 	DEBUG(0, "ft1000_cs: ft1000_attach()\n");
 
-	local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+	local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
 	if (!local) {
 		return -ENOMEM;
 	}
-	memset(local, 0, sizeof(local_info_t));
 	local->link = link;
 
 	link->priv = local;