From: Deepak Saxena Signed-off-by: Deepak Saxena Signed-off-by: Andrew Morton --- drivers/cdrom/mcdx.c | 4 +--- 1 files changed, 1 insertion(+), 3 deletions(-) diff -puN drivers/cdrom/mcdx.c~drivers-cdrom-kmalloc-memset-kzalloc-conversion drivers/cdrom/mcdx.c --- 25/drivers/cdrom/mcdx.c~drivers-cdrom-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:31:20 2005 +++ 25-akpm/drivers/cdrom/mcdx.c Tue Oct 11 15:31:20 2005 @@ -1085,7 +1085,7 @@ static int __init mcdx_init_drive(int dr xtrace(INIT, "kmalloc space for stuffpt's\n"); xtrace(MALLOC, "init() malloc %d bytes\n", size); - if (!(stuffp = kmalloc(size, GFP_KERNEL))) { + if (!(stuffp = kzalloc(size, GFP_KERNEL))) { xwarn("init() malloc failed\n"); return 1; } @@ -1101,8 +1101,6 @@ static int __init mcdx_init_drive(int dr sizeof(*stuffp), stuffp); /* set default values */ - memset(stuffp, 0, sizeof(*stuffp)); - stuffp->present = 0; /* this should be 0 already */ stuffp->toc = NULL; /* this should be NULL already */ _