Merge branch 'merge'

1 files changed, 1 insertions, 2 deletions

diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index 76a7d8ff6c0e..19d5dfc0702f 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -287,10 +287,9 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)
         if (be.encaps != PPPOATM_ENCAPS_AUTODETECT &&
             be.encaps != PPPOATM_ENCAPS_VC && be.encaps != PPPOATM_ENCAPS_LLC)
                 return -EINVAL;
-        pvcc = kmalloc(sizeof(*pvcc), GFP_KERNEL);
+        pvcc = kzalloc(sizeof(*pvcc), GFP_KERNEL);
         if (pvcc == NULL)
                 return -ENOMEM;
-        memset(pvcc, 0, sizeof(*pvcc));
         pvcc->atmvcc = atmvcc;
         pvcc->old_push = atmvcc->push;
         pvcc->old_pop = atmvcc->pop;