diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-09-09 08:21:46 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-09-12 04:48:16 -0400 |
commit | e560d8d8368ad8b6161839984b253de622863265 (patch) | |
tree | 983e5932adb9da5c0d1d080b11ce7b60049e556f /sound/pci/emu10k1/emu10k1x.c | |
parent | 9e76a76efc43d604a20bf0c5564caaf028a24d2e (diff) |
[ALSA] Replace with kzalloc() - pci stuff
AD1889 driver,ATIIXP driver,ATIIXP-modem driver,AZT3328 driver
BT87x driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
ES1938 driver,ES1968 driver,FM801 driver,Intel8x0 driver
Intel8x0-modem driver,Maestro3 driver,SonicVibes driver,VIA82xx driver
VIA82xx-modem driver,AC97 Codec,AK4531 codec,au88x0 driver
CA0106 driver,CS46xx driver,EMU10K1/EMU10K2 driver,HDA Codec driver
HDA generic driver,HDA Intel driver,ICE1712 driver,ICE1724 driver
KORG1212 driver,MIXART driver,NM256 driver,Trident driver,YMFPCI driver
Replace kcalloc(1,..) with kzalloc().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1/emu10k1x.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 52c7826df440..8c151af521d7 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -395,7 +395,7 @@ static int snd_emu10k1x_playback_open(snd_pcm_substream_t *substream) | |||
395 | if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0) | 395 | if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0) |
396 | return err; | 396 | return err; |
397 | 397 | ||
398 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 398 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
399 | if (epcm == NULL) | 399 | if (epcm == NULL) |
400 | return -ENOMEM; | 400 | return -ENOMEM; |
401 | epcm->emu = chip; | 401 | epcm->emu = chip; |
@@ -571,7 +571,7 @@ static int snd_emu10k1x_pcm_open_capture(snd_pcm_substream_t *substream) | |||
571 | if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0) | 571 | if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0) |
572 | return err; | 572 | return err; |
573 | 573 | ||
574 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 574 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
575 | if (epcm == NULL) | 575 | if (epcm == NULL) |
576 | return -ENOMEM; | 576 | return -ENOMEM; |
577 | 577 | ||
@@ -920,7 +920,7 @@ static int __devinit snd_emu10k1x_create(snd_card_t *card, | |||
920 | return -ENXIO; | 920 | return -ENXIO; |
921 | } | 921 | } |
922 | 922 | ||
923 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 923 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
924 | if (chip == NULL) { | 924 | if (chip == NULL) { |
925 | pci_disable_device(pci); | 925 | pci_disable_device(pci); |
926 | return -ENOMEM; | 926 | return -ENOMEM; |