Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / drivers / md / dm-hw-handler.c

diff --git a/drivers/md/dm-hw-handler.c b/drivers/md/dm-hw-handler.c
index 4cc0010..2ee84d8 100644 (file)
--- a/drivers/md/dm-hw-handler.c
+++ b/drivers/md/dm-hw-handler.c
@@ -83,8 +83,7 @@ void dm_put_hw_handler(struct hw_handler_type *hwht)
        if (--hwhi->use == 0)
                module_put(hwhi->hwht.module);
 
-       if (hwhi->use < 0)
-               BUG();
+       BUG_ON(hwhi->use < 0);
 
       out:
        up_read(&_hwh_lock);
@@ -92,12 +91,10 @@ void dm_put_hw_handler(struct hw_handler_type *hwht)
 
 static struct hwh_internal *_alloc_hw_handler(struct hw_handler_type *hwht)
 {
-       struct hwh_internal *hwhi = kmalloc(sizeof(*hwhi), GFP_KERNEL);
+       struct hwh_internal *hwhi = kzalloc(sizeof(*hwhi), GFP_KERNEL);
 
-       if (hwhi) {
-               memset(hwhi, 0, sizeof(*hwhi));
+       if (hwhi)
                hwhi->hwht = *hwht;
-       }
 
        return hwhi;
 }