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/emufx.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/emufx.c')
-rw-r--r-- | sound/pci/emu10k1/emufx.c | 8 |
1 files changed, 4 insertions, 4 deletions
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))) { |