diff options
author | Deepak Saxena <dsaxena@plexity.net> | 2005-11-07 01:01:22 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 07:53:59 -0800 |
commit | 5c857eeb0c18adaa7432afb519db066a6349687f (patch) | |
tree | 2f4675ff1f3fc076ee8fa69cd5a78542d0c0a045 /drivers/cdrom | |
parent | 3c76bc5bfda308aa42d5f42fde8dc1931e45e8a6 (diff) | |
download | lwn-5c857eeb0c18adaa7432afb519db066a6349687f.tar.gz lwn-5c857eeb0c18adaa7432afb519db066a6349687f.zip |
[PATCH] drivers/cdrom: kmalloc + memset -> kzalloc conversion
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/cdrom')
-rw-r--r-- | drivers/cdrom/mcdx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c index b89420e6d704..a0b580c22d80 100644 --- a/drivers/cdrom/mcdx.c +++ b/drivers/cdrom/mcdx.c @@ -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 */ |