summaryrefslogtreecommitdiffstats
path: root/sound/oss/opl3.c
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-02-14 00:33:16 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 08:09:54 -0800
commit3159f06dc2303630c02d1ad2eeaeaf341414c9df (patch)
tree678779f605dac635df3932381933b3950a0052ba /sound/oss/opl3.c
parentcd354f1ae75e6466a7e31b727faede57a1f89ca5 (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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c
index 2e8cfa5481f..fc273e55094 100644
--- a/sound/oss/opl3.c
+++ b/sound/oss/opl3.c
@@ -166,7 +166,7 @@ int opl3_detect(int ioaddr, int *osp)
return 0;
}
- devc = kmalloc(sizeof(*devc), GFP_KERNEL);
+ devc = kzalloc(sizeof(*devc), GFP_KERNEL);
if (devc == NULL)
{
@@ -175,7 +175,6 @@ int opl3_detect(int ioaddr, int *osp)
return 0;
}
- memset(devc, 0, sizeof(*devc));
strcpy(devc->fm_info.name, "OPL2");
if (!request_region(ioaddr, 4, devc->fm_info.name)) {