Pull dock into test branch

[linux-2.6-omap-h63xx.git] / drivers / isdn / hysdn / hysdn_init.c

diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c
index b75ac5af236a1a5eb102f1ff84554b2d23b02d28..9e01748a176e95c2726c2842ff102bca5fd3c4eb 100644 (file)
--- a/drivers/isdn/hysdn/hysdn_init.c
+++ b/drivers/isdn/hysdn/hysdn_init.c
@@ -10,7 +10,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/poll.h>
@@ -82,11 +81,10 @@ search_cards(void)
                if (pci_enable_device(akt_pcidev))
                        continue;
 
-               if (!(card = kmalloc(sizeof(hysdn_card), GFP_KERNEL))) {
+               if (!(card = kzalloc(sizeof(hysdn_card), GFP_KERNEL))) {
                        printk(KERN_ERR "HYSDN: unable to alloc device mem \n");
                        return;
                }
-               memset(card, 0, sizeof(hysdn_card));
                card->myid = cardmax;   /* set own id */
                card->bus = akt_pcidev->bus->number;
                card->devfn = akt_pcidev->devfn;        /* slot + function */