diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /sound/core/memory.c | |
parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
download | kernel_samsung_smdk4412-5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c.zip kernel_samsung_smdk4412-5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c.tar.gz kernel_samsung_smdk4412-5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c.tar.bz2 |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/core/memory.c')
-rw-r--r-- | sound/core/memory.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/core/memory.c b/sound/core/memory.c index 1622893..291b476 100644 --- a/sound/core/memory.c +++ b/sound/core/memory.c @@ -116,15 +116,21 @@ void *snd_hidden_kmalloc(size_t size, unsigned int __nocast flags) return _snd_kmalloc(size, flags); } +void *snd_hidden_kzalloc(size_t size, unsigned int __nocast flags) +{ + void *ret = _snd_kmalloc(size, flags); + if (ret) + memset(ret, 0, size); + return ret; +} +EXPORT_SYMBOL(snd_hidden_kzalloc); + void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags) { void *ret = NULL; if (n != 0 && size > INT_MAX / n) return ret; - ret = _snd_kmalloc(n * size, flags); - if (ret) - memset(ret, 0, n * size); - return ret; + return snd_hidden_kzalloc(n * size, flags); } void snd_hidden_kfree(const void *obj) |