diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-21 22:30:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-21 22:30:42 -0400 |
| commit | 08217637fe8a0ba24e1bfc893569f9be4d836c6a (patch) | |
| tree | aecd53ca7952b59d93f066161b677926e813a550 /sound/core/seq/seq_instr.c | |
| parent | 793b883ed12a6ae6e2901ddb5e038b77d6f0c0ac (diff) | |
| parent | efb0372bbaf5b829ff8c39db372779928af542a7 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/core/seq/seq_instr.c')
| -rw-r--r-- | sound/core/seq/seq_instr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/seq/seq_instr.c b/sound/core/seq/seq_instr.c index 5b40ea2ba8f4..019d43a462d7 100644 --- a/sound/core/seq/seq_instr.c +++ b/sound/core/seq/seq_instr.c | |||
| @@ -53,7 +53,7 @@ static snd_seq_kinstr_t *snd_seq_instr_new(int add_len, int atomic) | |||
| 53 | { | 53 | { |
| 54 | snd_seq_kinstr_t *instr; | 54 | snd_seq_kinstr_t *instr; |
| 55 | 55 | ||
| 56 | instr = kcalloc(1, sizeof(snd_seq_kinstr_t) + add_len, atomic ? GFP_ATOMIC : GFP_KERNEL); | 56 | instr = kzalloc(sizeof(snd_seq_kinstr_t) + add_len, atomic ? GFP_ATOMIC : GFP_KERNEL); |
| 57 | if (instr == NULL) | 57 | if (instr == NULL) |
| 58 | return NULL; | 58 | return NULL; |
| 59 | instr->add_len = add_len; | 59 | instr->add_len = add_len; |
| @@ -77,7 +77,7 @@ snd_seq_kinstr_list_t *snd_seq_instr_list_new(void) | |||
| 77 | { | 77 | { |
| 78 | snd_seq_kinstr_list_t *list; | 78 | snd_seq_kinstr_list_t *list; |
| 79 | 79 | ||
| 80 | list = kcalloc(1, sizeof(snd_seq_kinstr_list_t), GFP_KERNEL); | 80 | list = kzalloc(sizeof(snd_seq_kinstr_list_t), GFP_KERNEL); |
| 81 | if (list == NULL) | 81 | if (list == NULL) |
| 82 | return NULL; | 82 | return NULL; |
| 83 | spin_lock_init(&list->lock); | 83 | spin_lock_init(&list->lock); |