diff --git a/[refs] b/[refs] index 1080ae11c986..8623df57690e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4ebd9277705904aea25937c9a2d347c88c063c8 +refs/heads/master: a1152934c6339453f8bc365f449071d03796d411 diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c index 6650ae1c088f..5db295d7a879 100644 --- a/trunk/drivers/char/vt.c +++ b/trunk/drivers/char/vt.c @@ -729,10 +729,9 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ /* although the numbers above are not valid since long ago, the point is still up-to-date and the comment still has its value even if only as a historical artifact. --mj, July 1998 */ - vc = kmalloc(sizeof(struct vc_data), GFP_KERNEL); + vc = kzalloc(sizeof(struct vc_data), GFP_KERNEL); if (!vc) return -ENOMEM; - memset(vc, 0, sizeof(*vc)); vc_cons[currcons].d = vc; INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK); visual_init(vc, currcons, 1);