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/ac97 | |
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/ac97')
-rw-r--r-- | sound/pci/ac97/ac97_codec.c | 4 | ||||
-rw-r--r-- | sound/pci/ac97/ak4531_codec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 3b66fa689366..e64cb07a39c2 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
@@ -1797,7 +1797,7 @@ int snd_ac97_bus(snd_card_t *card, int num, ac97_bus_ops_t *ops, | |||
1797 | 1797 | ||
1798 | snd_assert(card != NULL, return -EINVAL); | 1798 | snd_assert(card != NULL, return -EINVAL); |
1799 | snd_assert(rbus != NULL, return -EINVAL); | 1799 | snd_assert(rbus != NULL, return -EINVAL); |
1800 | bus = kcalloc(1, sizeof(*bus), GFP_KERNEL); | 1800 | bus = kzalloc(sizeof(*bus), GFP_KERNEL); |
1801 | if (bus == NULL) | 1801 | if (bus == NULL) |
1802 | return -ENOMEM; | 1802 | return -ENOMEM; |
1803 | bus->card = card; | 1803 | bus->card = card; |
@@ -1906,7 +1906,7 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97) | |||
1906 | } | 1906 | } |
1907 | 1907 | ||
1908 | card = bus->card; | 1908 | card = bus->card; |
1909 | ac97 = kcalloc(1, sizeof(*ac97), GFP_KERNEL); | 1909 | ac97 = kzalloc(sizeof(*ac97), GFP_KERNEL); |
1910 | if (ac97 == NULL) | 1910 | if (ac97 == NULL) |
1911 | return -ENOMEM; | 1911 | return -ENOMEM; |
1912 | ac97->private_data = template->private_data; | 1912 | ac97->private_data = template->private_data; |
diff --git a/sound/pci/ac97/ak4531_codec.c b/sound/pci/ac97/ak4531_codec.c index f9ce0fd2f52f..4032c5748370 100644 --- a/sound/pci/ac97/ak4531_codec.c +++ b/sound/pci/ac97/ak4531_codec.c | |||
@@ -357,7 +357,7 @@ int snd_ak4531_mixer(snd_card_t * card, ak4531_t * _ak4531, ak4531_t ** rak4531) | |||
357 | snd_assert(rak4531 != NULL, return -EINVAL); | 357 | snd_assert(rak4531 != NULL, return -EINVAL); |
358 | *rak4531 = NULL; | 358 | *rak4531 = NULL; |
359 | snd_assert(card != NULL && _ak4531 != NULL, return -EINVAL); | 359 | snd_assert(card != NULL && _ak4531 != NULL, return -EINVAL); |
360 | ak4531 = kcalloc(1, sizeof(*ak4531), GFP_KERNEL); | 360 | ak4531 = kzalloc(sizeof(*ak4531), GFP_KERNEL); |
361 | if (ak4531 == NULL) | 361 | if (ak4531 == NULL) |
362 | return -ENOMEM; | 362 | return -ENOMEM; |
363 | *ak4531 = *_ak4531; | 363 | *ak4531 = *_ak4531; |