diff options
author | Robert P. J. Day <rpjday@mindspring.com> | 2007-02-14 03:33:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 11:09:54 -0500 |
commit | 3159f06dc2303630c02d1ad2eeaeaf341414c9df (patch) | |
tree | 678779f605dac635df3932381933b3950a0052ba /sound/oss/opl3.c | |
parent | cd354f1ae75e6466a7e31b727faede57a1f89ca5 (diff) |
[PATCH] OSS: replace kmalloc()+memset() combos with kzalloc()
Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls.
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/oss/opl3.c')
-rw-r--r-- | sound/oss/opl3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c index 2e8cfa5481f2..fc273e550944 100644 --- a/sound/oss/opl3.c +++ b/sound/oss/opl3.c | |||
@@ -166,7 +166,7 @@ int opl3_detect(int ioaddr, int *osp) | |||
166 | return 0; | 166 | return 0; |
167 | } | 167 | } |
168 | 168 | ||
169 | devc = kmalloc(sizeof(*devc), GFP_KERNEL); | 169 | devc = kzalloc(sizeof(*devc), GFP_KERNEL); |
170 | 170 | ||
171 | if (devc == NULL) | 171 | if (devc == NULL) |
172 | { | 172 | { |
@@ -175,7 +175,6 @@ int opl3_detect(int ioaddr, int *osp) | |||
175 | return 0; | 175 | return 0; |
176 | } | 176 | } |
177 | 177 | ||
178 | memset(devc, 0, sizeof(*devc)); | ||
179 | strcpy(devc->fm_info.name, "OPL2"); | 178 | strcpy(devc->fm_info.name, "OPL2"); |
180 | 179 | ||
181 | if (!request_region(ioaddr, 4, devc->fm_info.name)) { | 180 | if (!request_region(ioaddr, 4, devc->fm_info.name)) { |