diff options
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 1622893d00..291b4769bd 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) | |||
116 | return _snd_kmalloc(size, flags); | 116 | return _snd_kmalloc(size, flags); |
117 | } | 117 | } |
118 | 118 | ||
119 | void *snd_hidden_kzalloc(size_t size, unsigned int __nocast flags) | ||
120 | { | ||
121 | void *ret = _snd_kmalloc(size, flags); | ||
122 | if (ret) | ||
123 | memset(ret, 0, size); | ||
124 | return ret; | ||
125 | } | ||
126 | EXPORT_SYMBOL(snd_hidden_kzalloc); | ||
127 | |||
119 | void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags) | 128 | void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags) |
120 | { | 129 | { |
121 | void *ret = NULL; | 130 | void *ret = NULL; |
122 | if (n != 0 && size > INT_MAX / n) | 131 | if (n != 0 && size > INT_MAX / n) |
123 | return ret; | 132 | return ret; |
124 | ret = _snd_kmalloc(n * size, flags); | 133 | return snd_hidden_kzalloc(n * size, flags); |
125 | if (ret) | ||
126 | memset(ret, 0, n * size); | ||
127 | return ret; | ||
128 | } | 134 | } |
129 | 135 | ||
130 | void snd_hidden_kfree(const void *obj) | 136 | void snd_hidden_kfree(const void *obj) |