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 | |
| 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>
46 files changed, 76 insertions, 76 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; |
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index 37e8df24711c..8ce9cb4c7970 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | #include "ad1889.h" | 50 | #include "ad1889.h" |
| 51 | #include "ac97/ac97_id.h" | 51 | #include "ac97/ac97_id.h" |
| 52 | 52 | ||
| 53 | #define AD1889_DRVVER "$Revision: 1.1 $" | 53 | #define AD1889_DRVVER "$Revision: 1.2 $" |
| 54 | 54 | ||
| 55 | MODULE_AUTHOR("Kyle McMartin <kyle@parisc-linux.org>, Thibaut Varene <t-bone@parisc-linux.org>"); | 55 | MODULE_AUTHOR("Kyle McMartin <kyle@parisc-linux.org>, Thibaut Varene <t-bone@parisc-linux.org>"); |
| 56 | MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver"); | 56 | MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver"); |
| @@ -928,7 +928,7 @@ snd_ad1889_create(snd_card_t *card, | |||
| 928 | } | 928 | } |
| 929 | 929 | ||
| 930 | /* allocate chip specific data with zero-filled memory */ | 930 | /* allocate chip specific data with zero-filled memory */ |
| 931 | if ((chip = kcalloc(1, sizeof(*chip), GFP_KERNEL)) == NULL) { | 931 | if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) { |
| 932 | pci_disable_device(pci); | 932 | pci_disable_device(pci); |
| 933 | return -ENOMEM; | 933 | return -ENOMEM; |
| 934 | } | 934 | } |
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 19c7bd08d06d..874157f27011 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c | |||
| @@ -1531,7 +1531,7 @@ static int __devinit snd_atiixp_create(snd_card_t *card, | |||
| 1531 | if ((err = pci_enable_device(pci)) < 0) | 1531 | if ((err = pci_enable_device(pci)) < 0) |
| 1532 | return err; | 1532 | return err; |
| 1533 | 1533 | ||
| 1534 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1534 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1535 | if (chip == NULL) { | 1535 | if (chip == NULL) { |
| 1536 | pci_disable_device(pci); | 1536 | pci_disable_device(pci); |
| 1537 | return -ENOMEM; | 1537 | return -ENOMEM; |
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index 8d2002951bd7..4de637e4dd46 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
| @@ -1208,7 +1208,7 @@ static int __devinit snd_atiixp_create(snd_card_t *card, | |||
| 1208 | if ((err = pci_enable_device(pci)) < 0) | 1208 | if ((err = pci_enable_device(pci)) < 0) |
| 1209 | return err; | 1209 | return err; |
| 1210 | 1210 | ||
| 1211 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1211 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1212 | if (chip == NULL) { | 1212 | if (chip == NULL) { |
| 1213 | pci_disable_device(pci); | 1213 | pci_disable_device(pci); |
| 1214 | return -ENOMEM; | 1214 | return -ENOMEM; |
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c index 0e33e0650cf5..76b1c3018690 100644 --- a/sound/pci/au88x0/au88x0.c +++ b/sound/pci/au88x0/au88x0.c | |||
| @@ -156,7 +156,7 @@ snd_vortex_create(snd_card_t * card, struct pci_dev *pci, vortex_t ** rchip) | |||
| 156 | } | 156 | } |
| 157 | pci_set_dma_mask(pci, VORTEX_DMA_MASK); | 157 | pci_set_dma_mask(pci, VORTEX_DMA_MASK); |
| 158 | 158 | ||
| 159 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 159 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 160 | if (chip == NULL) | 160 | if (chip == NULL) |
| 161 | return -ENOMEM; | 161 | return -ENOMEM; |
| 162 | 162 | ||
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index 72bba7b2d983..26069d2e0271 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c | |||
| @@ -1345,7 +1345,7 @@ static int __devinit snd_azf3328_create(snd_card_t * card, | |||
| 1345 | if ((err = pci_enable_device(pci)) < 0) | 1345 | if ((err = pci_enable_device(pci)) < 0) |
| 1346 | return err; | 1346 | return err; |
| 1347 | 1347 | ||
| 1348 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1348 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1349 | if (chip == NULL) { | 1349 | if (chip == NULL) { |
| 1350 | pci_disable_device(pci); | 1350 | pci_disable_device(pci); |
| 1351 | return -ENOMEM; | 1351 | return -ENOMEM; |
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 2d124250bee7..639f08098f8c 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
| @@ -710,7 +710,7 @@ static int __devinit snd_bt87x_create(snd_card_t *card, | |||
| 710 | if (err < 0) | 710 | if (err < 0) |
| 711 | return err; | 711 | return err; |
| 712 | 712 | ||
| 713 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 713 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 714 | if (!chip) { | 714 | if (!chip) { |
| 715 | pci_disable_device(pci); | 715 | pci_disable_device(pci); |
| 716 | return -ENOMEM; | 716 | return -ENOMEM; |
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 4a1abb12ee5b..ba07960921d8 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
| @@ -352,7 +352,7 @@ static int snd_ca0106_pcm_open_playback_channel(snd_pcm_substream_t *substream, | |||
| 352 | snd_pcm_runtime_t *runtime = substream->runtime; | 352 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 353 | int err; | 353 | int err; |
| 354 | 354 | ||
| 355 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 355 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
| 356 | 356 | ||
| 357 | if (epcm == NULL) | 357 | if (epcm == NULL) |
| 358 | return -ENOMEM; | 358 | return -ENOMEM; |
| @@ -419,7 +419,7 @@ static int snd_ca0106_pcm_open_capture_channel(snd_pcm_substream_t *substream, i | |||
| 419 | snd_pcm_runtime_t *runtime = substream->runtime; | 419 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 420 | int err; | 420 | int err; |
| 421 | 421 | ||
| 422 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 422 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
| 423 | if (epcm == NULL) { | 423 | if (epcm == NULL) { |
| 424 | snd_printk("open_capture_channel: failed epcm alloc\n"); | 424 | snd_printk("open_capture_channel: failed epcm alloc\n"); |
| 425 | return -ENOMEM; | 425 | return -ENOMEM; |
| @@ -1144,7 +1144,7 @@ static int __devinit snd_ca0106_create(snd_card_t *card, | |||
| 1144 | return -ENXIO; | 1144 | return -ENXIO; |
| 1145 | } | 1145 | } |
| 1146 | 1146 | ||
| 1147 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1147 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1148 | if (chip == NULL) { | 1148 | if (chip == NULL) { |
| 1149 | pci_disable_device(pci); | 1149 | pci_disable_device(pci); |
| 1150 | return -ENOMEM; | 1150 | return -ENOMEM; |
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 97ad90d47bc2..583b2713d862 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
| @@ -2775,7 +2775,7 @@ static int __devinit snd_cmipci_create(snd_card_t *card, struct pci_dev *pci, | |||
| 2775 | if ((err = pci_enable_device(pci)) < 0) | 2775 | if ((err = pci_enable_device(pci)) < 0) |
| 2776 | return err; | 2776 | return err; |
| 2777 | 2777 | ||
| 2778 | cm = kcalloc(1, sizeof(*cm), GFP_KERNEL); | 2778 | cm = kzalloc(sizeof(*cm), GFP_KERNEL); |
| 2779 | if (cm == NULL) { | 2779 | if (cm == NULL) { |
| 2780 | pci_disable_device(pci); | 2780 | pci_disable_device(pci); |
| 2781 | return -ENOMEM; | 2781 | return -ENOMEM; |
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index e3e03028c721..421430bad989 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
| @@ -1383,7 +1383,7 @@ static int __devinit snd_cs4281_create(snd_card_t * card, | |||
| 1383 | *rchip = NULL; | 1383 | *rchip = NULL; |
| 1384 | if ((err = pci_enable_device(pci)) < 0) | 1384 | if ((err = pci_enable_device(pci)) < 0) |
| 1385 | return err; | 1385 | return err; |
| 1386 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1386 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1387 | if (chip == NULL) { | 1387 | if (chip == NULL) { |
| 1388 | pci_disable_device(pci); | 1388 | pci_disable_device(pci); |
| 1389 | return -ENOMEM; | 1389 | return -ENOMEM; |
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 03329a7efb91..6e3855b8b33d 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c | |||
| @@ -1304,7 +1304,7 @@ static int _cs46xx_playback_open_channel (snd_pcm_substream_t * substream,int pc | |||
| 1304 | cs46xx_pcm_t * cpcm; | 1304 | cs46xx_pcm_t * cpcm; |
| 1305 | snd_pcm_runtime_t *runtime = substream->runtime; | 1305 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 1306 | 1306 | ||
| 1307 | cpcm = kcalloc(1, sizeof(*cpcm), GFP_KERNEL); | 1307 | cpcm = kzalloc(sizeof(*cpcm), GFP_KERNEL); |
| 1308 | if (cpcm == NULL) | 1308 | if (cpcm == NULL) |
| 1309 | return -ENOMEM; | 1309 | return -ENOMEM; |
| 1310 | if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci), | 1310 | if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci), |
| @@ -3774,7 +3774,7 @@ int __devinit snd_cs46xx_create(snd_card_t * card, | |||
| 3774 | if ((err = pci_enable_device(pci)) < 0) | 3774 | if ((err = pci_enable_device(pci)) < 0) |
| 3775 | return err; | 3775 | return err; |
| 3776 | 3776 | ||
| 3777 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 3777 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 3778 | if (chip == NULL) { | 3778 | if (chip == NULL) { |
| 3779 | pci_disable_device(pci); | 3779 | pci_disable_device(pci); |
| 3780 | return -ENOMEM; | 3780 | return -ENOMEM; |
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index e69d5b739e80..03617ec0742f 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
| @@ -865,7 +865,7 @@ int __devinit snd_emu10k1_create(snd_card_t * card, | |||
| 865 | if ((err = pci_enable_device(pci)) < 0) | 865 | if ((err = pci_enable_device(pci)) < 0) |
| 866 | return err; | 866 | return err; |
| 867 | 867 | ||
| 868 | emu = kcalloc(1, sizeof(*emu), GFP_KERNEL); | 868 | emu = kzalloc(sizeof(*emu), GFP_KERNEL); |
| 869 | if (emu == NULL) { | 869 | if (emu == NULL) { |
| 870 | pci_disable_device(pci); | 870 | pci_disable_device(pci); |
| 871 | return -ENOMEM; | 871 | return -ENOMEM; |
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; |
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index 2f7a03103c91..646b5d972e6f 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c | |||
| @@ -1036,7 +1036,7 @@ static int __devinit _snd_emu10k1_audigy_init_efx(emu10k1_t *emu) | |||
| 1036 | spin_lock_init(&emu->fx8010.irq_lock); | 1036 | spin_lock_init(&emu->fx8010.irq_lock); |
| 1037 | INIT_LIST_HEAD(&emu->fx8010.gpr_ctl); | 1037 | INIT_LIST_HEAD(&emu->fx8010.gpr_ctl); |
| 1038 | 1038 | ||
| 1039 | if ((icode = kcalloc(1, sizeof(*icode), GFP_KERNEL)) == NULL || | 1039 | if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL || |
| 1040 | (icode->gpr_map = (u_int32_t __user *)kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t), GFP_KERNEL)) == NULL || | 1040 | (icode->gpr_map = (u_int32_t __user *)kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t), GFP_KERNEL)) == NULL || |
| 1041 | (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(*controls), GFP_KERNEL)) == NULL) { | 1041 | (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(*controls), GFP_KERNEL)) == NULL) { |
| 1042 | err = -ENOMEM; | 1042 | err = -ENOMEM; |
| @@ -1503,11 +1503,11 @@ static int __devinit _snd_emu10k1_init_efx(emu10k1_t *emu) | |||
| 1503 | spin_lock_init(&emu->fx8010.irq_lock); | 1503 | spin_lock_init(&emu->fx8010.irq_lock); |
| 1504 | INIT_LIST_HEAD(&emu->fx8010.gpr_ctl); | 1504 | INIT_LIST_HEAD(&emu->fx8010.gpr_ctl); |
| 1505 | 1505 | ||
| 1506 | if ((icode = kcalloc(1, sizeof(*icode), GFP_KERNEL)) == NULL) | 1506 | if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL) |
| 1507 | return -ENOMEM; | 1507 | return -ENOMEM; |
| 1508 | if ((icode->gpr_map = (u_int32_t __user *)kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t), GFP_KERNEL)) == NULL || | 1508 | if ((icode->gpr_map = (u_int32_t __user *)kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t), GFP_KERNEL)) == NULL || |
| 1509 | (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(emu10k1_fx8010_control_gpr_t), GFP_KERNEL)) == NULL || | 1509 | (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(emu10k1_fx8010_control_gpr_t), GFP_KERNEL)) == NULL || |
| 1510 | (ipcm = kcalloc(1, sizeof(*ipcm), GFP_KERNEL)) == NULL) { | 1510 | (ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) { |
| 1511 | err = -ENOMEM; | 1511 | err = -ENOMEM; |
| 1512 | goto __err; | 1512 | goto __err; |
| 1513 | } | 1513 | } |
| @@ -2217,7 +2217,7 @@ static int snd_emu10k1_fx8010_ioctl(snd_hwdep_t * hw, struct file *file, unsigne | |||
| 2217 | kfree(ipcm); | 2217 | kfree(ipcm); |
| 2218 | return res; | 2218 | return res; |
| 2219 | case SNDRV_EMU10K1_IOCTL_PCM_PEEK: | 2219 | case SNDRV_EMU10K1_IOCTL_PCM_PEEK: |
| 2220 | ipcm = kcalloc(1, sizeof(*ipcm), GFP_KERNEL); | 2220 | ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL); |
| 2221 | if (ipcm == NULL) | 2221 | if (ipcm == NULL) |
| 2222 | return -ENOMEM; | 2222 | return -ENOMEM; |
| 2223 | if (copy_from_user(ipcm, argp, sizeof(*ipcm))) { | 2223 | if (copy_from_user(ipcm, argp, sizeof(*ipcm))) { |
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 9c35f6dde1b5..66ba27afe962 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c | |||
| @@ -1016,7 +1016,7 @@ static int snd_emu10k1_efx_playback_open(snd_pcm_substream_t * substream) | |||
| 1016 | snd_pcm_runtime_t *runtime = substream->runtime; | 1016 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 1017 | int i; | 1017 | int i; |
| 1018 | 1018 | ||
| 1019 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 1019 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
| 1020 | if (epcm == NULL) | 1020 | if (epcm == NULL) |
| 1021 | return -ENOMEM; | 1021 | return -ENOMEM; |
| 1022 | epcm->emu = emu; | 1022 | epcm->emu = emu; |
| @@ -1049,7 +1049,7 @@ static int snd_emu10k1_playback_open(snd_pcm_substream_t * substream) | |||
| 1049 | snd_pcm_runtime_t *runtime = substream->runtime; | 1049 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 1050 | int i, err; | 1050 | int i, err; |
| 1051 | 1051 | ||
| 1052 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 1052 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
| 1053 | if (epcm == NULL) | 1053 | if (epcm == NULL) |
| 1054 | return -ENOMEM; | 1054 | return -ENOMEM; |
| 1055 | epcm->emu = emu; | 1055 | epcm->emu = emu; |
| @@ -1094,7 +1094,7 @@ static int snd_emu10k1_capture_open(snd_pcm_substream_t * substream) | |||
| 1094 | snd_pcm_runtime_t *runtime = substream->runtime; | 1094 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 1095 | emu10k1_pcm_t *epcm; | 1095 | emu10k1_pcm_t *epcm; |
| 1096 | 1096 | ||
| 1097 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 1097 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
| 1098 | if (epcm == NULL) | 1098 | if (epcm == NULL) |
| 1099 | return -ENOMEM; | 1099 | return -ENOMEM; |
| 1100 | epcm->emu = emu; | 1100 | epcm->emu = emu; |
| @@ -1130,7 +1130,7 @@ static int snd_emu10k1_capture_mic_open(snd_pcm_substream_t * substream) | |||
| 1130 | emu10k1_pcm_t *epcm; | 1130 | emu10k1_pcm_t *epcm; |
| 1131 | snd_pcm_runtime_t *runtime = substream->runtime; | 1131 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 1132 | 1132 | ||
| 1133 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 1133 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
| 1134 | if (epcm == NULL) | 1134 | if (epcm == NULL) |
| 1135 | return -ENOMEM; | 1135 | return -ENOMEM; |
| 1136 | epcm->emu = emu; | 1136 | epcm->emu = emu; |
| @@ -1170,7 +1170,7 @@ static int snd_emu10k1_capture_efx_open(snd_pcm_substream_t * substream) | |||
| 1170 | int nefx = emu->audigy ? 64 : 32; | 1170 | int nefx = emu->audigy ? 64 : 32; |
| 1171 | int idx; | 1171 | int idx; |
| 1172 | 1172 | ||
| 1173 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 1173 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
| 1174 | if (epcm == NULL) | 1174 | if (epcm == NULL) |
| 1175 | return -ENOMEM; | 1175 | return -ENOMEM; |
| 1176 | epcm->emu = emu; | 1176 | epcm->emu = emu; |
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c index a1691330d3b6..d59c7f345ad6 100644 --- a/sound/pci/emu10k1/p16v.c +++ b/sound/pci/emu10k1/p16v.c | |||
| @@ -178,7 +178,7 @@ static int snd_p16v_pcm_open_playback_channel(snd_pcm_substream_t *substream, in | |||
| 178 | snd_pcm_runtime_t *runtime = substream->runtime; | 178 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 179 | int err; | 179 | int err; |
| 180 | 180 | ||
| 181 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 181 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
| 182 | //snd_printk("epcm kcalloc: %p\n", epcm); | 182 | //snd_printk("epcm kcalloc: %p\n", epcm); |
| 183 | 183 | ||
| 184 | if (epcm == NULL) | 184 | if (epcm == NULL) |
| @@ -214,7 +214,7 @@ static int snd_p16v_pcm_open_capture_channel(snd_pcm_substream_t *substream, int | |||
| 214 | snd_pcm_runtime_t *runtime = substream->runtime; | 214 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 215 | int err; | 215 | int err; |
| 216 | 216 | ||
| 217 | epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL); | 217 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
| 218 | //snd_printk("epcm kcalloc: %p\n", epcm); | 218 | //snd_printk("epcm kcalloc: %p\n", epcm); |
| 219 | 219 | ||
| 220 | if (epcm == NULL) | 220 | if (epcm == NULL) |
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index e2c3a375855e..a38f7102eccf 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
| @@ -1943,7 +1943,7 @@ static int __devinit snd_ensoniq_create(snd_card_t * card, | |||
| 1943 | *rensoniq = NULL; | 1943 | *rensoniq = NULL; |
| 1944 | if ((err = pci_enable_device(pci)) < 0) | 1944 | if ((err = pci_enable_device(pci)) < 0) |
| 1945 | return err; | 1945 | return err; |
| 1946 | ensoniq = kcalloc(1, sizeof(*ensoniq), GFP_KERNEL); | 1946 | ensoniq = kzalloc(sizeof(*ensoniq), GFP_KERNEL); |
| 1947 | if (ensoniq == NULL) { | 1947 | if (ensoniq == NULL) { |
| 1948 | pci_disable_device(pci); | 1948 | pci_disable_device(pci); |
| 1949 | return -ENOMEM; | 1949 | return -ENOMEM; |
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index b3f78a5bb640..356c493d9319 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
| @@ -1494,7 +1494,7 @@ static int __devinit snd_es1938_create(snd_card_t * card, | |||
| 1494 | return -ENXIO; | 1494 | return -ENXIO; |
| 1495 | } | 1495 | } |
| 1496 | 1496 | ||
| 1497 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1497 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1498 | if (chip == NULL) { | 1498 | if (chip == NULL) { |
| 1499 | pci_disable_device(pci); | 1499 | pci_disable_device(pci); |
| 1500 | return -ENOMEM; | 1500 | return -ENOMEM; |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 8cfe80fcd774..10a487a78d68 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
| @@ -1577,7 +1577,7 @@ static int snd_es1968_playback_open(snd_pcm_substream_t *substream) | |||
| 1577 | if (apu1 < 0) | 1577 | if (apu1 < 0) |
| 1578 | return apu1; | 1578 | return apu1; |
| 1579 | 1579 | ||
| 1580 | es = kcalloc(1, sizeof(*es), GFP_KERNEL); | 1580 | es = kzalloc(sizeof(*es), GFP_KERNEL); |
| 1581 | if (!es) { | 1581 | if (!es) { |
| 1582 | snd_es1968_free_apu_pair(chip, apu1); | 1582 | snd_es1968_free_apu_pair(chip, apu1); |
| 1583 | return -ENOMEM; | 1583 | return -ENOMEM; |
| @@ -1622,7 +1622,7 @@ static int snd_es1968_capture_open(snd_pcm_substream_t *substream) | |||
| 1622 | return apu2; | 1622 | return apu2; |
| 1623 | } | 1623 | } |
| 1624 | 1624 | ||
| 1625 | es = kcalloc(1, sizeof(*es), GFP_KERNEL); | 1625 | es = kzalloc(sizeof(*es), GFP_KERNEL); |
| 1626 | if (!es) { | 1626 | if (!es) { |
| 1627 | snd_es1968_free_apu_pair(chip, apu1); | 1627 | snd_es1968_free_apu_pair(chip, apu1); |
| 1628 | snd_es1968_free_apu_pair(chip, apu2); | 1628 | snd_es1968_free_apu_pair(chip, apu2); |
| @@ -2569,7 +2569,7 @@ static int __devinit snd_es1968_create(snd_card_t * card, | |||
| 2569 | return -ENXIO; | 2569 | return -ENXIO; |
| 2570 | } | 2570 | } |
| 2571 | 2571 | ||
| 2572 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 2572 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 2573 | if (! chip) { | 2573 | if (! chip) { |
| 2574 | pci_disable_device(pci); | 2574 | pci_disable_device(pci); |
| 2575 | return -ENOMEM; | 2575 | return -ENOMEM; |
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index 36b2f62e8573..aaa41fb480a7 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c | |||
| @@ -1263,7 +1263,7 @@ static int __devinit snd_fm801_create(snd_card_t * card, | |||
| 1263 | *rchip = NULL; | 1263 | *rchip = NULL; |
| 1264 | if ((err = pci_enable_device(pci)) < 0) | 1264 | if ((err = pci_enable_device(pci)) < 0) |
| 1265 | return err; | 1265 | return err; |
| 1266 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1266 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1267 | if (chip == NULL) { | 1267 | if (chip == NULL) { |
| 1268 | pci_disable_device(pci); | 1268 | pci_disable_device(pci); |
| 1269 | return -ENOMEM; | 1269 | return -ENOMEM; |
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 20f7762f7144..3815403ed095 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
| @@ -288,7 +288,7 @@ static int init_unsol_queue(struct hda_bus *bus) | |||
| 288 | { | 288 | { |
| 289 | struct hda_bus_unsolicited *unsol; | 289 | struct hda_bus_unsolicited *unsol; |
| 290 | 290 | ||
| 291 | unsol = kcalloc(1, sizeof(*unsol), GFP_KERNEL); | 291 | unsol = kzalloc(sizeof(*unsol), GFP_KERNEL); |
| 292 | if (! unsol) { | 292 | if (! unsol) { |
| 293 | snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n"); | 293 | snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n"); |
| 294 | return -ENOMEM; | 294 | return -ENOMEM; |
| @@ -358,7 +358,7 @@ int snd_hda_bus_new(snd_card_t *card, const struct hda_bus_template *temp, | |||
| 358 | if (busp) | 358 | if (busp) |
| 359 | *busp = NULL; | 359 | *busp = NULL; |
| 360 | 360 | ||
| 361 | bus = kcalloc(1, sizeof(*bus), GFP_KERNEL); | 361 | bus = kzalloc(sizeof(*bus), GFP_KERNEL); |
| 362 | if (bus == NULL) { | 362 | if (bus == NULL) { |
| 363 | snd_printk(KERN_ERR "can't allocate struct hda_bus\n"); | 363 | snd_printk(KERN_ERR "can't allocate struct hda_bus\n"); |
| 364 | return -ENOMEM; | 364 | return -ENOMEM; |
| @@ -493,7 +493,7 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, | |||
| 493 | return -EBUSY; | 493 | return -EBUSY; |
| 494 | } | 494 | } |
| 495 | 495 | ||
| 496 | codec = kcalloc(1, sizeof(*codec), GFP_KERNEL); | 496 | codec = kzalloc(sizeof(*codec), GFP_KERNEL); |
| 497 | if (codec == NULL) { | 497 | if (codec == NULL) { |
| 498 | snd_printk(KERN_ERR "can't allocate struct hda_codec\n"); | 498 | snd_printk(KERN_ERR "can't allocate struct hda_codec\n"); |
| 499 | return -ENOMEM; | 499 | return -ENOMEM; |
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 1229227af5b5..5b829a1a4c60 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c | |||
| @@ -98,7 +98,7 @@ static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid | |||
| 98 | struct hda_gnode *node; | 98 | struct hda_gnode *node; |
| 99 | int nconns; | 99 | int nconns; |
| 100 | 100 | ||
| 101 | node = kcalloc(1, sizeof(*node), GFP_KERNEL); | 101 | node = kzalloc(sizeof(*node), GFP_KERNEL); |
| 102 | if (node == NULL) | 102 | if (node == NULL) |
| 103 | return -ENOMEM; | 103 | return -ENOMEM; |
| 104 | node->nid = nid; | 104 | node->nid = nid; |
| @@ -886,7 +886,7 @@ int snd_hda_parse_generic_codec(struct hda_codec *codec) | |||
| 886 | return -ENODEV; | 886 | return -ENODEV; |
| 887 | } | 887 | } |
| 888 | 888 | ||
| 889 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 889 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 890 | if (spec == NULL) { | 890 | if (spec == NULL) { |
| 891 | printk(KERN_ERR "hda_generic: can't allocate spec\n"); | 891 | printk(KERN_ERR "hda_generic: can't allocate spec\n"); |
| 892 | return -ENOMEM; | 892 | return -ENOMEM; |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index a8eaeb463b0d..7e0c05936c3e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -1402,7 +1402,7 @@ static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci, | |||
| 1402 | if ((err = pci_enable_device(pci)) < 0) | 1402 | if ((err = pci_enable_device(pci)) < 0) |
| 1403 | return err; | 1403 | return err; |
| 1404 | 1404 | ||
| 1405 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1405 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1406 | 1406 | ||
| 1407 | if (NULL == chip) { | 1407 | if (NULL == chip) { |
| 1408 | snd_printk(KERN_ERR SFX "cannot allocate chip\n"); | 1408 | snd_printk(KERN_ERR SFX "cannot allocate chip\n"); |
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index bceb83a42a38..da6874d3988c 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
| @@ -465,7 +465,7 @@ static int patch_ad1986a(struct hda_codec *codec) | |||
| 465 | { | 465 | { |
| 466 | struct ad198x_spec *spec; | 466 | struct ad198x_spec *spec; |
| 467 | 467 | ||
| 468 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 468 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 469 | if (spec == NULL) | 469 | if (spec == NULL) |
| 470 | return -ENOMEM; | 470 | return -ENOMEM; |
| 471 | 471 | ||
| @@ -623,7 +623,7 @@ static int patch_ad1983(struct hda_codec *codec) | |||
| 623 | { | 623 | { |
| 624 | struct ad198x_spec *spec; | 624 | struct ad198x_spec *spec; |
| 625 | 625 | ||
| 626 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 626 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 627 | if (spec == NULL) | 627 | if (spec == NULL) |
| 628 | return -ENOMEM; | 628 | return -ENOMEM; |
| 629 | 629 | ||
| @@ -764,7 +764,7 @@ static int patch_ad1981(struct hda_codec *codec) | |||
| 764 | { | 764 | { |
| 765 | struct ad198x_spec *spec; | 765 | struct ad198x_spec *spec; |
| 766 | 766 | ||
| 767 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 767 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 768 | if (spec == NULL) | 768 | if (spec == NULL) |
| 769 | return -ENOMEM; | 769 | return -ENOMEM; |
| 770 | 770 | ||
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c index 07fb4f5a54b3..523c362ec44d 100644 --- a/sound/pci/hda/patch_cmedia.c +++ b/sound/pci/hda/patch_cmedia.c | |||
| @@ -667,7 +667,7 @@ static int patch_cmi9880(struct hda_codec *codec) | |||
| 667 | { | 667 | { |
| 668 | struct cmi_spec *spec; | 668 | struct cmi_spec *spec; |
| 669 | 669 | ||
| 670 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 670 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 671 | if (spec == NULL) | 671 | if (spec == NULL) |
| 672 | return -ENOMEM; | 672 | return -ENOMEM; |
| 673 | 673 | ||
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 45f286faa21b..849b5b50c921 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -2095,7 +2095,7 @@ static int patch_alc880(struct hda_codec *codec) | |||
| 2095 | int board_config; | 2095 | int board_config; |
| 2096 | int i, err; | 2096 | int i, err; |
| 2097 | 2097 | ||
| 2098 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 2098 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 2099 | if (spec == NULL) | 2099 | if (spec == NULL) |
| 2100 | return -ENOMEM; | 2100 | return -ENOMEM; |
| 2101 | 2101 | ||
| @@ -2367,7 +2367,7 @@ static int patch_alc260(struct hda_codec *codec) | |||
| 2367 | struct alc_spec *spec; | 2367 | struct alc_spec *spec; |
| 2368 | int board_config; | 2368 | int board_config; |
| 2369 | 2369 | ||
| 2370 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 2370 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 2371 | if (spec == NULL) | 2371 | if (spec == NULL) |
| 2372 | return -ENOMEM; | 2372 | return -ENOMEM; |
| 2373 | 2373 | ||
| @@ -2617,7 +2617,7 @@ static int patch_alc882(struct hda_codec *codec) | |||
| 2617 | { | 2617 | { |
| 2618 | struct alc_spec *spec; | 2618 | struct alc_spec *spec; |
| 2619 | 2619 | ||
| 2620 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 2620 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 2621 | if (spec == NULL) | 2621 | if (spec == NULL) |
| 2622 | return -ENOMEM; | 2622 | return -ENOMEM; |
| 2623 | 2623 | ||
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c index c41fb9acdce4..d014b7bb70df 100644 --- a/sound/pci/hda/patch_si3054.c +++ b/sound/pci/hda/patch_si3054.c | |||
| @@ -283,7 +283,7 @@ static struct hda_codec_ops si3054_patch_ops = { | |||
| 283 | 283 | ||
| 284 | static int patch_si3054(struct hda_codec *codec) | 284 | static int patch_si3054(struct hda_codec *codec) |
| 285 | { | 285 | { |
| 286 | struct si3054_spec *spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 286 | struct si3054_spec *spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 287 | if (spec == NULL) | 287 | if (spec == NULL) |
| 288 | return -ENOMEM; | 288 | return -ENOMEM; |
| 289 | codec->spec = spec; | 289 | codec->spec = spec; |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 9d503da7320d..33a8adaea768 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -919,7 +919,7 @@ static int patch_stac9200(struct hda_codec *codec) | |||
| 919 | struct sigmatel_spec *spec; | 919 | struct sigmatel_spec *spec; |
| 920 | int err; | 920 | int err; |
| 921 | 921 | ||
| 922 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 922 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 923 | if (spec == NULL) | 923 | if (spec == NULL) |
| 924 | return -ENOMEM; | 924 | return -ENOMEM; |
| 925 | 925 | ||
| @@ -957,7 +957,7 @@ static int patch_stac922x(struct hda_codec *codec) | |||
| 957 | struct sigmatel_spec *spec; | 957 | struct sigmatel_spec *spec; |
| 958 | int err; | 958 | int err; |
| 959 | 959 | ||
| 960 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 960 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 961 | if (spec == NULL) | 961 | if (spec == NULL) |
| 962 | return -ENOMEM; | 962 | return -ENOMEM; |
| 963 | 963 | ||
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c index 4405d96cbedf..2e0a31613ee6 100644 --- a/sound/pci/ice1712/aureon.c +++ b/sound/pci/ice1712/aureon.c | |||
| @@ -1796,7 +1796,7 @@ static int __devinit aureon_init(ice1712_t *ice) | |||
| 1796 | } | 1796 | } |
| 1797 | 1797 | ||
| 1798 | /* to remeber the register values of CS8415 */ | 1798 | /* to remeber the register values of CS8415 */ |
| 1799 | ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 1799 | ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
| 1800 | if (! ice->akm) | 1800 | if (! ice->akm) |
| 1801 | return -ENOMEM; | 1801 | return -ENOMEM; |
| 1802 | ice->akm_codecs = 1; | 1802 | ice->akm_codecs = 1; |
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index f46160531503..7d4d9b0c6b11 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
| @@ -2529,7 +2529,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card, | |||
| 2529 | return -ENXIO; | 2529 | return -ENXIO; |
| 2530 | } | 2530 | } |
| 2531 | 2531 | ||
| 2532 | ice = kcalloc(1, sizeof(*ice), GFP_KERNEL); | 2532 | ice = kzalloc(sizeof(*ice), GFP_KERNEL); |
| 2533 | if (ice == NULL) { | 2533 | if (ice == NULL) { |
| 2534 | pci_disable_device(pci); | 2534 | pci_disable_device(pci); |
| 2535 | return -ENOMEM; | 2535 | return -ENOMEM; |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 78fc05c0800c..1e7119acfd40 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
| @@ -2124,7 +2124,7 @@ static int __devinit snd_vt1724_create(snd_card_t * card, | |||
| 2124 | if ((err = pci_enable_device(pci)) < 0) | 2124 | if ((err = pci_enable_device(pci)) < 0) |
| 2125 | return err; | 2125 | return err; |
| 2126 | 2126 | ||
| 2127 | ice = kcalloc(1, sizeof(*ice), GFP_KERNEL); | 2127 | ice = kzalloc(sizeof(*ice), GFP_KERNEL); |
| 2128 | if (ice == NULL) { | 2128 | if (ice == NULL) { |
| 2129 | pci_disable_device(pci); | 2129 | pci_disable_device(pci); |
| 2130 | return -ENOMEM; | 2130 | return -ENOMEM; |
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index 3fb297b969cd..2437876a44e4 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c | |||
| @@ -182,7 +182,7 @@ static int __devinit juli_init(ice1712_t *ice) | |||
| 182 | ice->num_total_dacs = 2; | 182 | ice->num_total_dacs = 2; |
| 183 | ice->num_total_adcs = 2; | 183 | ice->num_total_adcs = 2; |
| 184 | 184 | ||
| 185 | ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 185 | ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
| 186 | if (! ak) | 186 | if (! ak) |
| 187 | return -ENOMEM; | 187 | return -ENOMEM; |
| 188 | ice->akm_codecs = 1; | 188 | ice->akm_codecs = 1; |
diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c index 5bf734b04fa0..dcf1e8ca3f66 100644 --- a/sound/pci/ice1712/phase.c +++ b/sound/pci/ice1712/phase.c | |||
| @@ -122,7 +122,7 @@ static int __devinit phase22_init(ice1712_t *ice) | |||
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | // Initialize analog chips | 124 | // Initialize analog chips |
| 125 | ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 125 | ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
| 126 | if (! ak) | 126 | if (! ak) |
| 127 | return -ENOMEM; | 127 | return -ENOMEM; |
| 128 | ice->akm_codecs = 1; | 128 | ice->akm_codecs = 1; |
| @@ -386,7 +386,7 @@ static int __devinit phase28_init(ice1712_t *ice) | |||
| 386 | ice->num_total_adcs = 2; | 386 | ice->num_total_adcs = 2; |
| 387 | 387 | ||
| 388 | // Initialize analog chips | 388 | // Initialize analog chips |
| 389 | ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 389 | ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
| 390 | if (!ak) | 390 | if (!ak) |
| 391 | return -ENOMEM; | 391 | return -ENOMEM; |
| 392 | ice->akm_codecs = 1; | 392 | ice->akm_codecs = 1; |
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c index 25f827d8fbd9..a5f852b1f575 100644 --- a/sound/pci/ice1712/pontis.c +++ b/sound/pci/ice1712/pontis.c | |||
| @@ -781,7 +781,7 @@ static int __devinit pontis_init(ice1712_t *ice) | |||
| 781 | ice->num_total_adcs = 2; | 781 | ice->num_total_adcs = 2; |
| 782 | 782 | ||
| 783 | /* to remeber the register values */ | 783 | /* to remeber the register values */ |
| 784 | ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 784 | ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
| 785 | if (! ice->akm) | 785 | if (! ice->akm) |
| 786 | return -ENOMEM; | 786 | return -ENOMEM; |
| 787 | ice->akm_codecs = 1; | 787 | ice->akm_codecs = 1; |
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 47965dfcbee9..5975cd580545 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
| @@ -2604,7 +2604,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card, | |||
| 2604 | if ((err = pci_enable_device(pci)) < 0) | 2604 | if ((err = pci_enable_device(pci)) < 0) |
| 2605 | return err; | 2605 | return err; |
| 2606 | 2606 | ||
| 2607 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 2607 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 2608 | if (chip == NULL) { | 2608 | if (chip == NULL) { |
| 2609 | pci_disable_device(pci); | 2609 | pci_disable_device(pci); |
| 2610 | return -ENOMEM; | 2610 | return -ENOMEM; |
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 282b4bd67c3a..38493d77528b 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
| @@ -1113,7 +1113,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card, | |||
| 1113 | if ((err = pci_enable_device(pci)) < 0) | 1113 | if ((err = pci_enable_device(pci)) < 0) |
| 1114 | return err; | 1114 | return err; |
| 1115 | 1115 | ||
| 1116 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1116 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1117 | if (chip == NULL) { | 1117 | if (chip == NULL) { |
| 1118 | pci_disable_device(pci); | 1118 | pci_disable_device(pci); |
| 1119 | return -ENOMEM; | 1119 | return -ENOMEM; |
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index d2aa9c82d41e..5f61536f1127 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c | |||
| @@ -2220,7 +2220,7 @@ static int __devinit snd_korg1212_create(snd_card_t * card, struct pci_dev *pci, | |||
| 2220 | if ((err = pci_enable_device(pci)) < 0) | 2220 | if ((err = pci_enable_device(pci)) < 0) |
| 2221 | return err; | 2221 | return err; |
| 2222 | 2222 | ||
| 2223 | korg1212 = kcalloc(1, sizeof(*korg1212), GFP_KERNEL); | 2223 | korg1212 = kzalloc(sizeof(*korg1212), GFP_KERNEL); |
| 2224 | if (korg1212 == NULL) { | 2224 | if (korg1212 == NULL) { |
| 2225 | pci_disable_device(pci); | 2225 | pci_disable_device(pci); |
| 2226 | return -ENOMEM; | 2226 | return -ENOMEM; |
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 7b85a472292a..635531c2aa06 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
| @@ -2660,7 +2660,7 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci, | |||
| 2660 | return -ENXIO; | 2660 | return -ENXIO; |
| 2661 | } | 2661 | } |
| 2662 | 2662 | ||
| 2663 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 2663 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 2664 | if (chip == NULL) { | 2664 | if (chip == NULL) { |
| 2665 | pci_disable_device(pci); | 2665 | pci_disable_device(pci); |
| 2666 | return -ENOMEM; | 2666 | return -ENOMEM; |
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 6c868d913634..2636d507bdfb 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
| @@ -1004,7 +1004,7 @@ static int __devinit snd_mixart_create(mixart_mgr_t *mgr, snd_card_t *card, int | |||
| 1004 | .dev_free = snd_mixart_chip_dev_free, | 1004 | .dev_free = snd_mixart_chip_dev_free, |
| 1005 | }; | 1005 | }; |
| 1006 | 1006 | ||
| 1007 | mgr->chip[idx] = chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1007 | mgr->chip[idx] = chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1008 | if (! chip) { | 1008 | if (! chip) { |
| 1009 | snd_printk(KERN_ERR "cannot allocate chip\n"); | 1009 | snd_printk(KERN_ERR "cannot allocate chip\n"); |
| 1010 | return -ENOMEM; | 1010 | return -ENOMEM; |
| @@ -1292,7 +1292,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci, | |||
| 1292 | 1292 | ||
| 1293 | /* | 1293 | /* |
| 1294 | */ | 1294 | */ |
| 1295 | mgr = kcalloc(1, sizeof(*mgr), GFP_KERNEL); | 1295 | mgr = kzalloc(sizeof(*mgr), GFP_KERNEL); |
| 1296 | if (! mgr) { | 1296 | if (! mgr) { |
| 1297 | pci_disable_device(pci); | 1297 | pci_disable_device(pci); |
| 1298 | return -ENOMEM; | 1298 | return -ENOMEM; |
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 542b58e4bf44..b44d56c2dd3d 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c | |||
| @@ -1389,7 +1389,7 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci, | |||
| 1389 | if ((err = pci_enable_device(pci)) < 0) | 1389 | if ((err = pci_enable_device(pci)) < 0) |
| 1390 | return err; | 1390 | return err; |
| 1391 | 1391 | ||
| 1392 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1392 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1393 | if (chip == NULL) { | 1393 | if (chip == NULL) { |
| 1394 | pci_disable_device(pci); | 1394 | pci_disable_device(pci); |
| 1395 | return -ENOMEM; | 1395 | return -ENOMEM; |
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index 3d431390c1c0..57c8ff5f5260 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
| @@ -1250,7 +1250,7 @@ static int __devinit snd_sonicvibes_create(snd_card_t * card, | |||
| 1250 | return -ENXIO; | 1250 | return -ENXIO; |
| 1251 | } | 1251 | } |
| 1252 | 1252 | ||
| 1253 | sonic = kcalloc(1, sizeof(*sonic), GFP_KERNEL); | 1253 | sonic = kzalloc(sizeof(*sonic), GFP_KERNEL); |
| 1254 | if (sonic == NULL) { | 1254 | if (sonic == NULL) { |
| 1255 | pci_disable_device(pci); | 1255 | pci_disable_device(pci); |
| 1256 | return -ENOMEM; | 1256 | return -ENOMEM; |
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index f30d9d947862..777da9a7298b 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c | |||
| @@ -2960,7 +2960,7 @@ static int __devinit snd_trident_mixer(trident_t * trident, int pcm_spdif_device | |||
| 2960 | .read = snd_trident_codec_read, | 2960 | .read = snd_trident_codec_read, |
| 2961 | }; | 2961 | }; |
| 2962 | 2962 | ||
| 2963 | uctl = kcalloc(1, sizeof(*uctl), GFP_KERNEL); | 2963 | uctl = kzalloc(sizeof(*uctl), GFP_KERNEL); |
| 2964 | if (!uctl) | 2964 | if (!uctl) |
| 2965 | return -ENOMEM; | 2965 | return -ENOMEM; |
| 2966 | 2966 | ||
| @@ -3546,7 +3546,7 @@ int __devinit snd_trident_create(snd_card_t * card, | |||
| 3546 | return -ENXIO; | 3546 | return -ENXIO; |
| 3547 | } | 3547 | } |
| 3548 | 3548 | ||
| 3549 | trident = kcalloc(1, sizeof(*trident), GFP_KERNEL); | 3549 | trident = kzalloc(sizeof(*trident), GFP_KERNEL); |
| 3550 | if (trident == NULL) { | 3550 | if (trident == NULL) { |
| 3551 | pci_disable_device(pci); | 3551 | pci_disable_device(pci); |
| 3552 | return -ENOMEM; | 3552 | return -ENOMEM; |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index cfd2c9cc9b37..a58f88a552a3 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
| @@ -2058,7 +2058,7 @@ static int __devinit snd_via82xx_create(snd_card_t * card, | |||
| 2058 | if ((err = pci_enable_device(pci)) < 0) | 2058 | if ((err = pci_enable_device(pci)) < 0) |
| 2059 | return err; | 2059 | return err; |
| 2060 | 2060 | ||
| 2061 | if ((chip = kcalloc(1, sizeof(*chip), GFP_KERNEL)) == NULL) { | 2061 | if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) { |
| 2062 | pci_disable_device(pci); | 2062 | pci_disable_device(pci); |
| 2063 | return -ENOMEM; | 2063 | return -ENOMEM; |
| 2064 | } | 2064 | } |
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 5872d438a04a..e36f538d02fc 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c | |||
| @@ -1083,7 +1083,7 @@ static int __devinit snd_via82xx_create(snd_card_t * card, | |||
| 1083 | if ((err = pci_enable_device(pci)) < 0) | 1083 | if ((err = pci_enable_device(pci)) < 0) |
| 1084 | return err; | 1084 | return err; |
| 1085 | 1085 | ||
| 1086 | if ((chip = kcalloc(1, sizeof(*chip), GFP_KERNEL)) == NULL) { | 1086 | if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) { |
| 1087 | pci_disable_device(pci); | 1087 | pci_disable_device(pci); |
| 1088 | return -ENOMEM; | 1088 | return -ENOMEM; |
| 1089 | } | 1089 | } |
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 054836412dc4..27fa523639ae 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
| @@ -839,7 +839,7 @@ static int snd_ymfpci_playback_open_1(snd_pcm_substream_t * substream) | |||
| 839 | snd_pcm_runtime_t *runtime = substream->runtime; | 839 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 840 | ymfpci_pcm_t *ypcm; | 840 | ymfpci_pcm_t *ypcm; |
| 841 | 841 | ||
| 842 | ypcm = kcalloc(1, sizeof(*ypcm), GFP_KERNEL); | 842 | ypcm = kzalloc(sizeof(*ypcm), GFP_KERNEL); |
| 843 | if (ypcm == NULL) | 843 | if (ypcm == NULL) |
| 844 | return -ENOMEM; | 844 | return -ENOMEM; |
| 845 | ypcm->chip = chip; | 845 | ypcm->chip = chip; |
| @@ -957,7 +957,7 @@ static int snd_ymfpci_capture_open(snd_pcm_substream_t * substream, | |||
| 957 | snd_pcm_runtime_t *runtime = substream->runtime; | 957 | snd_pcm_runtime_t *runtime = substream->runtime; |
| 958 | ymfpci_pcm_t *ypcm; | 958 | ymfpci_pcm_t *ypcm; |
| 959 | 959 | ||
| 960 | ypcm = kcalloc(1, sizeof(*ypcm), GFP_KERNEL); | 960 | ypcm = kzalloc(sizeof(*ypcm), GFP_KERNEL); |
| 961 | if (ypcm == NULL) | 961 | if (ypcm == NULL) |
| 962 | return -ENOMEM; | 962 | return -ENOMEM; |
| 963 | ypcm->chip = chip; | 963 | ypcm->chip = chip; |
| @@ -2270,7 +2270,7 @@ int __devinit snd_ymfpci_create(snd_card_t * card, | |||
| 2270 | if ((err = pci_enable_device(pci)) < 0) | 2270 | if ((err = pci_enable_device(pci)) < 0) |
| 2271 | return err; | 2271 | return err; |
| 2272 | 2272 | ||
| 2273 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 2273 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 2274 | if (chip == NULL) { | 2274 | if (chip == NULL) { |
| 2275 | pci_disable_device(pci); | 2275 | pci_disable_device(pci); |
| 2276 | return -ENOMEM; | 2276 | return -ENOMEM; |
