diff options
Diffstat (limited to 'sound/core/seq/instr/ainstr_iw.c')
-rw-r--r-- | sound/core/seq/instr/ainstr_iw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/seq/instr/ainstr_iw.c b/sound/core/seq/instr/ainstr_iw.c index 2622b8679ca..b3cee092b1a 100644 --- a/sound/core/seq/instr/ainstr_iw.c +++ b/sound/core/seq/instr/ainstr_iw.c | |||
@@ -92,7 +92,7 @@ static int snd_seq_iwffff_copy_env_from_stream(__u32 req_stype, | |||
92 | points_size = (le16_to_cpu(rx.nattack) + le16_to_cpu(rx.nrelease)) * 2 * sizeof(__u16); | 92 | points_size = (le16_to_cpu(rx.nattack) + le16_to_cpu(rx.nrelease)) * 2 * sizeof(__u16); |
93 | if (points_size > *len) | 93 | if (points_size > *len) |
94 | return -EINVAL; | 94 | return -EINVAL; |
95 | rp = kcalloc(1, sizeof(*rp) + points_size, gfp_mask); | 95 | rp = kzalloc(sizeof(*rp) + points_size, gfp_mask); |
96 | if (rp == NULL) | 96 | if (rp == NULL) |
97 | return -ENOMEM; | 97 | return -ENOMEM; |
98 | rp->nattack = le16_to_cpu(rx.nattack); | 98 | rp->nattack = le16_to_cpu(rx.nattack); |
@@ -139,7 +139,7 @@ static int snd_seq_iwffff_copy_wave_from_stream(snd_iwffff_ops_t *ops, | |||
139 | return -EFAULT; | 139 | return -EFAULT; |
140 | *data += sizeof(xp); | 140 | *data += sizeof(xp); |
141 | *len -= sizeof(xp); | 141 | *len -= sizeof(xp); |
142 | wp = kcalloc(1, sizeof(*wp), gfp_mask); | 142 | wp = kzalloc(sizeof(*wp), gfp_mask); |
143 | if (wp == NULL) | 143 | if (wp == NULL) |
144 | return -ENOMEM; | 144 | return -ENOMEM; |
145 | wp->share_id[0] = le32_to_cpu(xp.share_id[0]); | 145 | wp->share_id[0] = le32_to_cpu(xp.share_id[0]); |
@@ -273,7 +273,7 @@ static int snd_seq_iwffff_put(void *private_data, snd_seq_kinstr_t *instr, | |||
273 | snd_seq_iwffff_instr_free(ops, ip, atomic); | 273 | snd_seq_iwffff_instr_free(ops, ip, atomic); |
274 | return -EINVAL; | 274 | return -EINVAL; |
275 | } | 275 | } |
276 | lp = kcalloc(1, sizeof(*lp), gfp_mask); | 276 | lp = kzalloc(sizeof(*lp), gfp_mask); |
277 | if (lp == NULL) { | 277 | if (lp == NULL) { |
278 | snd_seq_iwffff_instr_free(ops, ip, atomic); | 278 | snd_seq_iwffff_instr_free(ops, ip, atomic); |
279 | return -ENOMEM; | 279 | return -ENOMEM; |