diff options
Diffstat (limited to 'sound/synth')
-rw-r--r-- | sound/synth/emux/emux.c | 2 | ||||
-rw-r--r-- | sound/synth/emux/emux_seq.c | 2 | ||||
-rw-r--r-- | sound/synth/emux/soundfont.c | 8 | ||||
-rw-r--r-- | sound/synth/util_mem.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c index 60d0b2c66698..9e2b4c0c8a8a 100644 --- a/sound/synth/emux/emux.c +++ b/sound/synth/emux/emux.c | |||
@@ -40,7 +40,7 @@ int snd_emux_new(snd_emux_t **remu) | |||
40 | snd_emux_t *emu; | 40 | snd_emux_t *emu; |
41 | 41 | ||
42 | *remu = NULL; | 42 | *remu = NULL; |
43 | emu = kcalloc(1, sizeof(*emu), GFP_KERNEL); | 43 | emu = kzalloc(sizeof(*emu), GFP_KERNEL); |
44 | if (emu == NULL) | 44 | if (emu == NULL) |
45 | return -ENOMEM; | 45 | return -ENOMEM; |
46 | 46 | ||
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c index e41b28d9bf52..8ccd33f4aa57 100644 --- a/sound/synth/emux/emux_seq.c +++ b/sound/synth/emux/emux_seq.c | |||
@@ -146,7 +146,7 @@ snd_emux_create_port(snd_emux_t *emu, char *name, | |||
146 | int i, type, cap; | 146 | int i, type, cap; |
147 | 147 | ||
148 | /* Allocate structures for this channel */ | 148 | /* Allocate structures for this channel */ |
149 | if ((p = kcalloc(1, sizeof(*p), GFP_KERNEL)) == NULL) { | 149 | if ((p = kzalloc(sizeof(*p), GFP_KERNEL)) == NULL) { |
150 | snd_printk("no memory\n"); | 150 | snd_printk("no memory\n"); |
151 | return NULL; | 151 | return NULL; |
152 | } | 152 | } |
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c index 901a7db05bde..d0925ea50838 100644 --- a/sound/synth/emux/soundfont.c +++ b/sound/synth/emux/soundfont.c | |||
@@ -266,7 +266,7 @@ newsf(snd_sf_list_t *sflist, int type, char *name) | |||
266 | } | 266 | } |
267 | 267 | ||
268 | /* not found -- create a new one */ | 268 | /* not found -- create a new one */ |
269 | sf = kcalloc(1, sizeof(*sf), GFP_KERNEL); | 269 | sf = kzalloc(sizeof(*sf), GFP_KERNEL); |
270 | if (sf == NULL) | 270 | if (sf == NULL) |
271 | return NULL; | 271 | return NULL; |
272 | sf->id = sflist->fonts_size; | 272 | sf->id = sflist->fonts_size; |
@@ -346,7 +346,7 @@ sf_zone_new(snd_sf_list_t *sflist, snd_soundfont_t *sf) | |||
346 | { | 346 | { |
347 | snd_sf_zone_t *zp; | 347 | snd_sf_zone_t *zp; |
348 | 348 | ||
349 | if ((zp = kcalloc(1, sizeof(*zp), GFP_KERNEL)) == NULL) | 349 | if ((zp = kzalloc(sizeof(*zp), GFP_KERNEL)) == NULL) |
350 | return NULL; | 350 | return NULL; |
351 | zp->next = sf->zones; | 351 | zp->next = sf->zones; |
352 | sf->zones = zp; | 352 | sf->zones = zp; |
@@ -377,7 +377,7 @@ sf_sample_new(snd_sf_list_t *sflist, snd_soundfont_t *sf) | |||
377 | { | 377 | { |
378 | snd_sf_sample_t *sp; | 378 | snd_sf_sample_t *sp; |
379 | 379 | ||
380 | if ((sp = kcalloc(1, sizeof(*sp), GFP_KERNEL)) == NULL) | 380 | if ((sp = kzalloc(sizeof(*sp), GFP_KERNEL)) == NULL) |
381 | return NULL; | 381 | return NULL; |
382 | 382 | ||
383 | sp->next = sf->samples; | 383 | sp->next = sf->samples; |
@@ -1362,7 +1362,7 @@ snd_sf_new(snd_sf_callback_t *callback, snd_util_memhdr_t *hdr) | |||
1362 | { | 1362 | { |
1363 | snd_sf_list_t *sflist; | 1363 | snd_sf_list_t *sflist; |
1364 | 1364 | ||
1365 | if ((sflist = kcalloc(1, sizeof(*sflist), GFP_KERNEL)) == NULL) | 1365 | if ((sflist = kzalloc(sizeof(*sflist), GFP_KERNEL)) == NULL) |
1366 | return NULL; | 1366 | return NULL; |
1367 | 1367 | ||
1368 | init_MUTEX(&sflist->presets_mutex); | 1368 | init_MUTEX(&sflist->presets_mutex); |
diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c index 8b131a11e549..5f75bf31bc36 100644 --- a/sound/synth/util_mem.c +++ b/sound/synth/util_mem.c | |||
@@ -38,7 +38,7 @@ snd_util_memhdr_new(int memsize) | |||
38 | { | 38 | { |
39 | snd_util_memhdr_t *hdr; | 39 | snd_util_memhdr_t *hdr; |
40 | 40 | ||
41 | hdr = kcalloc(1, sizeof(*hdr), GFP_KERNEL); | 41 | hdr = kzalloc(sizeof(*hdr), GFP_KERNEL); |
42 | if (hdr == NULL) | 42 | if (hdr == NULL) |
43 | return NULL; | 43 | return NULL; |
44 | hdr->size = memsize; | 44 | hdr->size = memsize; |