diff options
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/ad1816a/ad1816a_lib.c | 2 | ||||
-rw-r--r-- | sound/isa/ad1848/ad1848_lib.c | 2 | ||||
-rw-r--r-- | sound/isa/cs423x/cs4231_lib.c | 2 | ||||
-rw-r--r-- | sound/isa/es1688/es1688_lib.c | 2 | ||||
-rw-r--r-- | sound/isa/es18xx.c | 2 | ||||
-rw-r--r-- | sound/isa/gus/gus_main.c | 2 | ||||
-rw-r--r-- | sound/isa/gus/gus_mem_proc.c | 4 | ||||
-rw-r--r-- | sound/isa/gus/gus_pcm.c | 2 | ||||
-rw-r--r-- | sound/isa/opl3sa2.c | 2 | ||||
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 2 | ||||
-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 |
14 files changed, 15 insertions, 15 deletions
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c index ae860360ecf9..27a9dcfbba00 100644 --- a/sound/isa/ad1816a/ad1816a_lib.c +++ b/sound/isa/ad1816a/ad1816a_lib.c | |||
@@ -591,7 +591,7 @@ int snd_ad1816a_create(snd_card_t *card, | |||
591 | 591 | ||
592 | *rchip = NULL; | 592 | *rchip = NULL; |
593 | 593 | ||
594 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 594 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
595 | if (chip == NULL) | 595 | if (chip == NULL) |
596 | return -ENOMEM; | 596 | return -ENOMEM; |
597 | chip->irq = -1; | 597 | chip->irq = -1; |
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c index bc642dc94547..303861cd03cd 100644 --- a/sound/isa/ad1848/ad1848_lib.c +++ b/sound/isa/ad1848/ad1848_lib.c | |||
@@ -890,7 +890,7 @@ int snd_ad1848_create(snd_card_t * card, | |||
890 | int err; | 890 | int err; |
891 | 891 | ||
892 | *rchip = NULL; | 892 | *rchip = NULL; |
893 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 893 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
894 | if (chip == NULL) | 894 | if (chip == NULL) |
895 | return -ENOMEM; | 895 | return -ENOMEM; |
896 | spin_lock_init(&chip->reg_lock); | 896 | spin_lock_init(&chip->reg_lock); |
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c index 3199941edd9b..32318258cd8e 100644 --- a/sound/isa/cs423x/cs4231_lib.c +++ b/sound/isa/cs423x/cs4231_lib.c | |||
@@ -1480,7 +1480,7 @@ static int snd_cs4231_new(snd_card_t * card, | |||
1480 | cs4231_t *chip; | 1480 | cs4231_t *chip; |
1481 | 1481 | ||
1482 | *rchip = NULL; | 1482 | *rchip = NULL; |
1483 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1483 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
1484 | if (chip == NULL) | 1484 | if (chip == NULL) |
1485 | return -ENOMEM; | 1485 | return -ENOMEM; |
1486 | chip->hardware = hardware; | 1486 | chip->hardware = hardware; |
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c index 17f68d07d9b2..aac898765c02 100644 --- a/sound/isa/es1688/es1688_lib.c +++ b/sound/isa/es1688/es1688_lib.c | |||
@@ -649,7 +649,7 @@ int snd_es1688_create(snd_card_t * card, | |||
649 | int err; | 649 | int err; |
650 | 650 | ||
651 | *rchip = NULL; | 651 | *rchip = NULL; |
652 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 652 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
653 | if (chip == NULL) | 653 | if (chip == NULL) |
654 | return -ENOMEM; | 654 | return -ENOMEM; |
655 | chip->irq = -1; | 655 | chip->irq = -1; |
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index f654d5948367..d0ea19f42703 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c | |||
@@ -1686,7 +1686,7 @@ static int __devinit snd_es18xx_new_device(snd_card_t * card, | |||
1686 | int err; | 1686 | int err; |
1687 | 1687 | ||
1688 | *rchip = NULL; | 1688 | *rchip = NULL; |
1689 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1689 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
1690 | if (chip == NULL) | 1690 | if (chip == NULL) |
1691 | return -ENOMEM; | 1691 | return -ENOMEM; |
1692 | spin_lock_init(&chip->reg_lock); | 1692 | spin_lock_init(&chip->reg_lock); |
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index a636d9ce3502..8f2872f8e8f6 100644 --- a/sound/isa/gus/gus_main.c +++ b/sound/isa/gus/gus_main.c | |||
@@ -157,7 +157,7 @@ int snd_gus_create(snd_card_t * card, | |||
157 | }; | 157 | }; |
158 | 158 | ||
159 | *rgus = NULL; | 159 | *rgus = NULL; |
160 | gus = kcalloc(1, sizeof(*gus), GFP_KERNEL); | 160 | gus = kzalloc(sizeof(*gus), GFP_KERNEL); |
161 | if (gus == NULL) | 161 | if (gus == NULL) |
162 | return -ENOMEM; | 162 | return -ENOMEM; |
163 | gus->gf1.irq = -1; | 163 | gus->gf1.irq = -1; |
diff --git a/sound/isa/gus/gus_mem_proc.c b/sound/isa/gus/gus_mem_proc.c index 886763f12132..7f96ac237f3c 100644 --- a/sound/isa/gus/gus_mem_proc.c +++ b/sound/isa/gus/gus_mem_proc.c | |||
@@ -98,7 +98,7 @@ int snd_gf1_mem_proc_init(snd_gus_card_t * gus) | |||
98 | 98 | ||
99 | for (idx = 0; idx < 4; idx++) { | 99 | for (idx = 0; idx < 4; idx++) { |
100 | if (gus->gf1.mem_alloc.banks_8[idx].size > 0) { | 100 | if (gus->gf1.mem_alloc.banks_8[idx].size > 0) { |
101 | priv = kcalloc(1, sizeof(*priv), GFP_KERNEL); | 101 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); |
102 | if (priv == NULL) | 102 | if (priv == NULL) |
103 | return -ENOMEM; | 103 | return -ENOMEM; |
104 | priv->gus = gus; | 104 | priv->gus = gus; |
@@ -115,7 +115,7 @@ int snd_gf1_mem_proc_init(snd_gus_card_t * gus) | |||
115 | } | 115 | } |
116 | for (idx = 0; idx < 4; idx++) { | 116 | for (idx = 0; idx < 4; idx++) { |
117 | if (gus->gf1.rom_present & (1 << idx)) { | 117 | if (gus->gf1.rom_present & (1 << idx)) { |
118 | priv = kcalloc(1, sizeof(*priv), GFP_KERNEL); | 118 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); |
119 | if (priv == NULL) | 119 | if (priv == NULL) |
120 | return -ENOMEM; | 120 | return -ENOMEM; |
121 | priv->rom = 1; | 121 | priv->rom = 1; |
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c index b75066ab46fc..beb01365dc46 100644 --- a/sound/isa/gus/gus_pcm.c +++ b/sound/isa/gus/gus_pcm.c | |||
@@ -666,7 +666,7 @@ static int snd_gf1_pcm_playback_open(snd_pcm_substream_t *substream) | |||
666 | snd_pcm_runtime_t *runtime = substream->runtime; | 666 | snd_pcm_runtime_t *runtime = substream->runtime; |
667 | int err; | 667 | int err; |
668 | 668 | ||
669 | pcmp = kcalloc(1, sizeof(*pcmp), GFP_KERNEL); | 669 | pcmp = kzalloc(sizeof(*pcmp), GFP_KERNEL); |
670 | if (pcmp == NULL) | 670 | if (pcmp == NULL) |
671 | return -ENOMEM; | 671 | return -ENOMEM; |
672 | pcmp->gus = gus; | 672 | pcmp->gus = gus; |
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index e2d615bbb2f7..e2d2babcd20b 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c | |||
@@ -715,7 +715,7 @@ static int __devinit snd_opl3sa2_probe(int dev, | |||
715 | return -ENOMEM; | 715 | return -ENOMEM; |
716 | strcpy(card->driver, "OPL3SA2"); | 716 | strcpy(card->driver, "OPL3SA2"); |
717 | strcpy(card->shortname, "Yamaha OPL3-SA2"); | 717 | strcpy(card->shortname, "Yamaha OPL3-SA2"); |
718 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 718 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
719 | if (chip == NULL) { | 719 | if (chip == NULL) { |
720 | err = -ENOMEM; | 720 | err = -ENOMEM; |
721 | goto __error; | 721 | goto __error; |
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index a490bcacdfa8..73573cb1db6a 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
@@ -1273,7 +1273,7 @@ static int snd_opti93x_create(snd_card_t *card, opti9xx_t *chip, | |||
1273 | opti93x_t *codec; | 1273 | opti93x_t *codec; |
1274 | 1274 | ||
1275 | *rcodec = NULL; | 1275 | *rcodec = NULL; |
1276 | codec = kcalloc(1, sizeof(*codec), GFP_KERNEL); | 1276 | codec = kzalloc(sizeof(*codec), GFP_KERNEL); |
1277 | if (codec == NULL) | 1277 | if (codec == NULL) |
1278 | return -ENOMEM; | 1278 | return -ENOMEM; |
1279 | codec->irq = -1; | 1279 | codec->irq = -1; |
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); |