Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index db06f34..1c05212 100644 (file)
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -3416,27 +3416,28 @@ init_card(struct atm_dev *dev)
 
        size = sizeof(struct vc_map *) * card->tct_size;
        IPRINTK("%s: allocate %d byte for VC map.\n", card->name, size);
-       if (NULL == (card->vcs = vmalloc(size))) {
+       card->vcs = vzalloc(size);
+       if (!card->vcs) {
                printk("%s: memory allocation failure.\n", card->name);
                deinit_card(card);
                return -1;
        }
-       memset(card->vcs, 0, size);
 
        size = sizeof(struct vc_map *) * card->scd_size;
        IPRINTK("%s: allocate %d byte for SCD to VC mapping.\n",
                card->name, size);
-       if (NULL == (card->scd2vc = vmalloc(size))) {
+       card->scd2vc = vzalloc(size);
+       if (!card->scd2vc) {
                printk("%s: memory allocation failure.\n", card->name);
                deinit_card(card);
                return -1;
        }
-       memset(card->scd2vc, 0, size);
 
        size = sizeof(struct tst_info) * (card->tst_size - 2);
        IPRINTK("%s: allocate %d byte for TST to VC mapping.\n",
                card->name, size);
-       if (NULL == (card->soft_tst = vmalloc(size))) {
+       card->soft_tst = vmalloc(size);
+       if (!card->soft_tst) {
                printk("%s: memory allocation failure.\n", card->name);
                deinit_card(card);
                return -1;