Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c857eeb authored by Deepak Saxena's avatar Deepak Saxena Committed by Linus Torvalds
Browse files

[PATCH] drivers/cdrom: kmalloc + memset -> kzalloc conversion 



Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3c76bc5b

drivers/cdrom/mcdx.c

+1 −3
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ static int __init mcdx_init_drive(int drive) 


	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 drive) 
	       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 */