---

yaml --- r: 236348 b: refs/heads/master c: 2f48131 h: refs/heads/master v: v3
git-mirror · Mar 9, 2011 · 3f71a3c · 3f71a3c
1 parent 77a3ade
commit 3f71a3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;