Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / atm / adummy.c

diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index 6cc93de..ac2c108 100644 (file)
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -113,15 +113,13 @@ static int __init adummy_init(void)
 
        printk(KERN_ERR "adummy: version %s\n", DRV_VERSION);
 
-       adummy_dev = (struct adummy_dev *) kmalloc(sizeof(struct adummy_dev),
+       adummy_dev = kzalloc(sizeof(struct adummy_dev),
                                                   GFP_KERNEL);
        if (!adummy_dev) {
-               printk(KERN_ERR DEV_LABEL ": kmalloc() failed\n");
+               printk(KERN_ERR DEV_LABEL ": kzalloc() failed\n");
                err = -ENOMEM;
                goto out;
        }
-       memset(adummy_dev, 0, sizeof(struct adummy_dev));
-
        atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL);
        if (!atm_dev) {
                printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");