Merge branch 'generic-dispatch' of git://brick.kernel.dk/data/git/linux-2.6-block

[powerpc.git] / drivers / md / dm-emc.c

diff --git a/drivers/md/dm-emc.c b/drivers/md/dm-emc.c
index 7006586..c706767 100644 (file)
--- a/drivers/md/dm-emc.c
+++ b/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))