aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/dmasound/tas3004.c
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-02-14 03:33:16 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 11:09:54 -0500
commit3159f06dc2303630c02d1ad2eeaeaf341414c9df (patch)
tree678779f605dac635df3932381933b3950a0052ba /sound/oss/dmasound/tas3004.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/dmasound/tas3004.c')
-rw-r--r--sound/oss/dmasound/tas3004.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/dmasound/tas3004.c b/sound/oss/dmasound/tas3004.c
index af34fb39bc29..678bf0ff6da2 100644
--- a/sound/oss/dmasound/tas3004.c
+++ b/sound/oss/dmasound/tas3004.c
@@ -1092,10 +1092,9 @@ tas3004_init(struct i2c_client *client)
1092 char mcr2 = 0; 1092 char mcr2 = 0;
1093 int i, j; 1093 int i, j;
1094 1094
1095 self = kmalloc(sz, GFP_KERNEL); 1095 self = kzalloc(sz, GFP_KERNEL);
1096 if (!self) 1096 if (!self)
1097 return -ENOMEM; 1097 return -ENOMEM;
1098 memset(self, 0, sz);
1099 1098
1100 self->super.client = client; 1099 self->super.client = client;
1101 self->super.shadow = (tas_shadow_t *)(self+1); 1100 self->super.shadow = (tas_shadow_t *)(self+1);