diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-09-09 08:21:17 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-09-12 04:48:09 -0400 |
commit | 9e76a76efc43d604a20bf0c5564caaf028a24d2e (patch) | |
tree | 92b186afb7a8a800482dfb2d7e093b2d4da3b80d /sound/isa/sb | |
parent | ecca82b4b447f8df73c807a018dac3e2863912d9 (diff) |
[ALSA] Replace with kzalloc() - isa stuff
ES18xx driver,OPL3SA2 driver,AD1816A driver,AD1848 driver,CS4231 driver
ES1688 driver,GUS Library,Opti9xx drivers,EMU8000 driver
SB16/AWE driver,SB drivers
Replace kcalloc(1,..) with kzalloc().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/sb')
-rw-r--r-- | sound/isa/sb/emu8000.c | 2 | ||||
-rw-r--r-- | sound/isa/sb/emu8000_pcm.c | 2 | ||||
-rw-r--r-- | sound/isa/sb/sb16_csp.c | 2 | ||||
-rw-r--r-- | sound/isa/sb/sb_common.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index 028af4066595..5375705c054b 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c | |||
@@ -1097,7 +1097,7 @@ snd_emu8000_new(snd_card_t *card, int index, long port, int seq_ports, snd_seq_d | |||
1097 | if (seq_ports <= 0) | 1097 | if (seq_ports <= 0) |
1098 | return 0; | 1098 | return 0; |
1099 | 1099 | ||
1100 | hw = kcalloc(1, sizeof(*hw), GFP_KERNEL); | 1100 | hw = kzalloc(sizeof(*hw), GFP_KERNEL); |
1101 | if (hw == NULL) | 1101 | if (hw == NULL) |
1102 | return -ENOMEM; | 1102 | return -ENOMEM; |
1103 | spin_lock_init(&hw->reg_lock); | 1103 | spin_lock_init(&hw->reg_lock); |
diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c index db5eb8b55058..0209790dc4b5 100644 --- a/sound/isa/sb/emu8000_pcm.c +++ b/sound/isa/sb/emu8000_pcm.c | |||
@@ -233,7 +233,7 @@ static int emu8k_pcm_open(snd_pcm_substream_t *subs) | |||
233 | emu8k_pcm_t *rec; | 233 | emu8k_pcm_t *rec; |
234 | snd_pcm_runtime_t *runtime = subs->runtime; | 234 | snd_pcm_runtime_t *runtime = subs->runtime; |
235 | 235 | ||
236 | rec = kcalloc(1, sizeof(*rec), GFP_KERNEL); | 236 | rec = kzalloc(sizeof(*rec), GFP_KERNEL); |
237 | if (! rec) | 237 | if (! rec) |
238 | return -ENOMEM; | 238 | return -ENOMEM; |
239 | 239 | ||
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c index d64790bcd831..7192d4c758e6 100644 --- a/sound/isa/sb/sb16_csp.c +++ b/sound/isa/sb/sb16_csp.c | |||
@@ -122,7 +122,7 @@ int snd_sb_csp_new(sb_t *chip, int device, snd_hwdep_t ** rhwdep) | |||
122 | if ((err = snd_hwdep_new(chip->card, "SB16-CSP", device, &hw)) < 0) | 122 | if ((err = snd_hwdep_new(chip->card, "SB16-CSP", device, &hw)) < 0) |
123 | return err; | 123 | return err; |
124 | 124 | ||
125 | if ((p = kcalloc(1, sizeof(*p), GFP_KERNEL)) == NULL) { | 125 | if ((p = kzalloc(sizeof(*p), GFP_KERNEL)) == NULL) { |
126 | snd_device_free(chip->card, hw); | 126 | snd_device_free(chip->card, hw); |
127 | return -ENOMEM; | 127 | return -ENOMEM; |
128 | } | 128 | } |
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index 5b6bde213ea0..f0f205ae425f 100644 --- a/sound/isa/sb/sb_common.c +++ b/sound/isa/sb/sb_common.c | |||
@@ -221,7 +221,7 @@ int snd_sbdsp_create(snd_card_t *card, | |||
221 | 221 | ||
222 | snd_assert(r_chip != NULL, return -EINVAL); | 222 | snd_assert(r_chip != NULL, return -EINVAL); |
223 | *r_chip = NULL; | 223 | *r_chip = NULL; |
224 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 224 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
225 | if (chip == NULL) | 225 | if (chip == NULL) |
226 | return -ENOMEM; | 226 | return -ENOMEM; |
227 | spin_lock_init(&chip->reg_lock); | 227 | spin_lock_init(&chip->reg_lock); |