aboutsummaryrefslogtreecommitdiffstats
path: root/sound/synth/util_mem.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-08-08 11:12:47 -0400
committerJaroslav Kysela <perex@perex.cz>2008-08-13 05:46:40 -0400
commit5e246b850df563224be26f1d409cf66fd6c968df (patch)
tree970e7faf60b86cb2c489a08ca506075c398165e5 /sound/synth/util_mem.c
parentda3cec35dd3c31d8706db4bf379372ce70d92118 (diff)
ALSA: Kill snd_assert() in other places
Kill snd_assert() in other places, either removed or replaced with if () with snd_BUG_ON(). Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/synth/util_mem.c')
-rw-r--r--sound/synth/util_mem.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c
index deabe5f899c4..c85522e3808d 100644
--- a/sound/synth/util_mem.c
+++ b/sound/synth/util_mem.c
@@ -55,7 +55,8 @@ void snd_util_memhdr_free(struct snd_util_memhdr *hdr)
55{ 55{
56 struct list_head *p; 56 struct list_head *p;
57 57
58 snd_assert(hdr != NULL, return); 58 if (!hdr)
59 return;
59 /* release all blocks */ 60 /* release all blocks */
60 while ((p = hdr->block.next) != &hdr->block) { 61 while ((p = hdr->block.next) != &hdr->block) {
61 list_del(p); 62 list_del(p);
@@ -74,8 +75,8 @@ __snd_util_mem_alloc(struct snd_util_memhdr *hdr, int size)
74 unsigned int units, prev_offset; 75 unsigned int units, prev_offset;
75 struct list_head *p; 76 struct list_head *p;
76 77
77 snd_assert(hdr != NULL, return NULL); 78 if (snd_BUG_ON(!hdr || size <= 0))
78 snd_assert(size > 0, return NULL); 79 return NULL;
79 80
80 /* word alignment */ 81 /* word alignment */
81 units = size; 82 units = size;
@@ -161,7 +162,8 @@ __snd_util_mem_free(struct snd_util_memhdr *hdr, struct snd_util_memblk *blk)
161 */ 162 */
162int snd_util_mem_free(struct snd_util_memhdr *hdr, struct snd_util_memblk *blk) 163int snd_util_mem_free(struct snd_util_memhdr *hdr, struct snd_util_memblk *blk)
163{ 164{
164 snd_assert(hdr && blk, return -EINVAL); 165 if (snd_BUG_ON(!hdr || !blk))
166 return -EINVAL;
165 167
166 mutex_lock(&hdr->block_mutex); 168 mutex_lock(&hdr->block_mutex);
167 __snd_util_mem_free(hdr, blk); 169 __snd_util_mem_free(hdr, blk);