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

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

diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index e828c54..f556969 100644 (file)
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1457,10 +1457,9 @@ static int __devinit vcc_table_allocate(struct lanai_dev *lanai)
        return (lanai->vccs == NULL) ? -ENOMEM : 0;
 #else
        int bytes = (lanai->num_vci) * sizeof(struct lanai_vcc *);
-       lanai->vccs = (struct lanai_vcc **) vmalloc(bytes);
+       lanai->vccs = vzalloc(bytes);
        if (unlikely(lanai->vccs == NULL))
                return -ENOMEM;
-       memset(lanai->vccs, 0, bytes);
        return 0;
 #endif
 }