diff options
Diffstat (limited to 'sound/isa/gus')
-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 |
3 files changed, 4 insertions, 4 deletions
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; |