From 5bf978433f086e46e87db8876f407d5d2b61c3cb Mon Sep 17 00:00:00 2001
From: Alasdair G Kergon <agk@redhat.com>
Date: Thu, 5 May 2005 16:16:08 -0700
Subject: [PATCH] --- yaml --- r: 1030 b: refs/heads/master c:
 f1daa40b638891a62e1be40f78d752c500265362 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/dm-emc.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ff57a55bc07a..34a2de7f17eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c557308e1f4b6f7d6144a06e8f98c467814f3aed
+refs/heads/master: f1daa40b638891a62e1be40f78d752c500265362
diff --git a/trunk/drivers/md/dm-emc.c b/trunk/drivers/md/dm-emc.c
index 700658664594..c7067674dcb7 100644
--- a/trunk/drivers/md/dm-emc.c
+++ b/trunk/drivers/md/dm-emc.c
@@ -223,8 +223,10 @@ static struct emc_handler *alloc_emc_handler(void)
 {
 	struct emc_handler *h = kmalloc(sizeof(*h), GFP_KERNEL);
 
-	if (h)
+	if (h) {
+		memset(h, 0, sizeof(*h));
 		spin_lock_init(&h->lock);
+	}
 
 	return h;
 }
@@ -259,8 +261,6 @@ static int emc_create(struct hw_handler *hwh, unsigned argc, char **argv)
 	if (!h)
 		return -ENOMEM;
 
-	memset(h, 0, sizeof(*h));
-
 	hwh->context = h;
 
 	if ((h->short_trespass = short_trespass))