diff options
author | Deepak Saxena <dsaxena@plexity.net> | 2005-11-07 04:01:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:59 -0500 |
commit | 5c857eeb0c18adaa7432afb519db066a6349687f (patch) | |
tree | 2f4675ff1f3fc076ee8fa69cd5a78542d0c0a045 | |
parent | 3c76bc5bfda308aa42d5f42fde8dc1931e45e8a6 (diff) |
[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>
-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) | |||
1085 | 1085 | ||
1086 | xtrace(INIT, "kmalloc space for stuffpt's\n"); | 1086 | xtrace(INIT, "kmalloc space for stuffpt's\n"); |
1087 | xtrace(MALLOC, "init() malloc %d bytes\n", size); | 1087 | xtrace(MALLOC, "init() malloc %d bytes\n", size); |
1088 | if (!(stuffp = kmalloc(size, GFP_KERNEL))) { | 1088 | if (!(stuffp = kzalloc(size, GFP_KERNEL))) { |
1089 | xwarn("init() malloc failed\n"); | 1089 | xwarn("init() malloc failed\n"); |
1090 | return 1; | 1090 | return 1; |
1091 | } | 1091 | } |
@@ -1101,8 +1101,6 @@ static int __init mcdx_init_drive(int drive) | |||
1101 | sizeof(*stuffp), stuffp); | 1101 | sizeof(*stuffp), stuffp); |
1102 | 1102 | ||
1103 | /* set default values */ | 1103 | /* set default values */ |
1104 | memset(stuffp, 0, sizeof(*stuffp)); | ||
1105 | |||
1106 | stuffp->present = 0; /* this should be 0 already */ | 1104 | stuffp->present = 0; /* this should be 0 already */ |
1107 | stuffp->toc = NULL; /* this should be NULL already */ | 1105 | stuffp->toc = NULL; /* this should be NULL already */ |
1108 | 1106 | ||