adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ALSA] Replace with kzalloc() - others

Browse source 
Documentation,SA11xx UDA1341 driver,Generic drivers,MPU401 UART,OPL3
OPL4,Digigram VX core,I2C cs8427,I2C lib core,I2C tea6330t,L3 drivers
AK4114 receiver,AK4117 receiver,PDAudioCF driver,PPC PMAC driver
SPARC AMD7930 driver,SPARC cs4231 driver,Synth,Common EMU synth
USB generic driver,USB USX2Y
Replace kcalloc(1,..) with kzalloc().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2005-09-09 14:22:34 +02:00 committed by Jaroslav Kysela
parent e560d8d836
commit 561b220a4d
29 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
View file

@ -447,7 +447,7 @@
.... ....
/* allocate a chip-specific data with zero filled */ /* allocate a chip-specific data with zero filled */
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
@ -949,7 +949,7 @@
After allocating a card instance via After allocating a card instance via
<function>snd_card_new()</function> (with <function>snd_card_new()</function> (with
<constant>NULL</constant> on the 4th arg), call <constant>NULL</constant> on the 4th arg), call
<function>kcalloc()</function>. <function>kzalloc()</function>.
<informalexample> <informalexample>
<programlisting> <programlisting>
@ -958,7 +958,7 @@
mychip_t *chip; mychip_t *chip;
card = snd_card_new(index[dev], id[dev], THIS_MODULE, NULL); card = snd_card_new(index[dev], id[dev], THIS_MODULE, NULL);
..... .....
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
@ -1136,7 +1136,7 @@
return -ENXIO; return -ENXIO;
} }
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) { if (chip == NULL) {
pci_disable_device(pci); pci_disable_device(pci);
return -ENOMEM; return -ENOMEM;
@ -1292,7 +1292,7 @@
need to initialize this number as -1 before actual allocation, need to initialize this number as -1 before actual allocation,
since irq 0 is valid. The port address and its resource pointer since irq 0 is valid. The port address and its resource pointer
can be initialized as null by can be initialized as null by
<function>kcalloc()</function> automatically, so you <function>kzalloc()</function> automatically, so you
don't have to take care of resetting them. don't have to take care of resetting them.
</para> </para>

4
sound/arm/sa11xx-uda1341.c
View file

@ -21,7 +21,7 @@
* merged HAL layer (patches from Brian) * merged HAL layer (patches from Brian)
*/ */
/* $Id: sa11xx-uda1341.c,v 1.22 2005/09/05 16:17:58 tiwai Exp $ */ /* $Id: sa11xx-uda1341.c,v 1.23 2005/09/09 13:22:34 tiwai Exp $ */
/*************************************************************************************************** /***************************************************************************************************
* *
@ -918,7 +918,7 @@ static int __init sa11xx_uda1341_init(void)
if (card == NULL) if (card == NULL)
return -ENOMEM; return -ENOMEM;
sa11xx_uda1341 = kcalloc(1, sizeof(*sa11xx_uda1341), GFP_KERNEL); sa11xx_uda1341 = kzalloc(sizeof(*sa11xx_uda1341), GFP_KERNEL);
if (sa11xx_uda1341 == NULL) if (sa11xx_uda1341 == NULL)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&chip->s[0].dma_lock); spin_lock_init(&chip->s[0].dma_lock);

4
sound/drivers/dummy.c
View file

@ -337,7 +337,7 @@ static int snd_card_dummy_playback_open(snd_pcm_substream_t * substream)
snd_card_dummy_pcm_t *dpcm; snd_card_dummy_pcm_t *dpcm;
int err; int err;
dpcm = kcalloc(1, sizeof(*dpcm), GFP_KERNEL); dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
if (dpcm == NULL) if (dpcm == NULL)
return -ENOMEM; return -ENOMEM;
init_timer(&dpcm->timer); init_timer(&dpcm->timer);
@ -368,7 +368,7 @@ static int snd_card_dummy_capture_open(snd_pcm_substream_t * substream)
snd_card_dummy_pcm_t *dpcm; snd_card_dummy_pcm_t *dpcm;
int err; int err;
dpcm = kcalloc(1, sizeof(*dpcm), GFP_KERNEL); dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
if (dpcm == NULL) if (dpcm == NULL)
return -ENOMEM; return -ENOMEM;
init_timer(&dpcm->timer); init_timer(&dpcm->timer);

2
sound/drivers/mpu401/mpu401_uart.c
View file

@ -463,7 +463,7 @@ int snd_mpu401_uart_new(snd_card_t * card, int device,
*rrawmidi = NULL; *rrawmidi = NULL;
if ((err = snd_rawmidi_new(card, "MPU-401U", device, 1, 1, &rmidi)) < 0) if ((err = snd_rawmidi_new(card, "MPU-401U", device, 1, 1, &rmidi)) < 0)
return err; return err;
mpu = kcalloc(1, sizeof(*mpu), GFP_KERNEL); mpu = kzalloc(sizeof(*mpu), GFP_KERNEL);
if (mpu == NULL) { if (mpu == NULL) {
snd_device_free(card, rmidi); snd_device_free(card, rmidi);
return -ENOMEM; return -ENOMEM;

2
sound/drivers/mtpav.c
View file

@ -688,7 +688,7 @@ static int snd_mtpav_get_RAWMIDI(mtpav_t * mcard)
static mtpav_t *new_mtpav(void) static mtpav_t *new_mtpav(void)
{ {
mtpav_t *ncrd = kcalloc(1, sizeof(*ncrd), GFP_KERNEL); mtpav_t *ncrd = kzalloc(sizeof(*ncrd), GFP_KERNEL);
if (ncrd != NULL) { if (ncrd != NULL) {
spin_lock_init(&ncrd->spinlock); spin_lock_init(&ncrd->spinlock);

2
sound/drivers/opl3/opl3_lib.c
View file

@ -354,7 +354,7 @@ int snd_opl3_new(snd_card_t *card,
int err; int err;
*ropl3 = NULL; *ropl3 = NULL;
opl3 = kcalloc(1, sizeof(*opl3), GFP_KERNEL); opl3 = kzalloc(sizeof(*opl3), GFP_KERNEL);
if (opl3 == NULL) if (opl3 == NULL)
return -ENOMEM; return -ENOMEM;

2
sound/drivers/opl3/opl3_oss.c
View file

@ -241,7 +241,7 @@ static int snd_opl3_load_patch_seq_oss(snd_seq_oss_arg_t *arg, int format,
} }
size = sizeof(*put) + sizeof(fm_xinstrument_t); size = sizeof(*put) + sizeof(fm_xinstrument_t);
put = kcalloc(1, size, GFP_KERNEL); put = kzalloc(size, GFP_KERNEL);
if (put == NULL) if (put == NULL)
return -ENOMEM; return -ENOMEM;
/* build header */ /* build header */

2
sound/drivers/opl4/opl4_lib.c
View file

@ -204,7 +204,7 @@ int snd_opl4_create(snd_card_t *card,
if (ropl4) if (ropl4)
*ropl4 = NULL; *ropl4 = NULL;
opl4 = kcalloc(1, sizeof(*opl4), GFP_KERNEL); opl4 = kzalloc(sizeof(*opl4), GFP_KERNEL);
if (!opl4) if (!opl4)
return -ENOMEM; return -ENOMEM;

2
sound/drivers/serial-u16550.c
View file

@ -779,7 +779,7 @@ static int __init snd_uart16550_create(snd_card_t * card,
int err; int err;
if ((uart = kcalloc(1, sizeof(*uart), GFP_KERNEL)) == NULL) if ((uart = kzalloc(sizeof(*uart), GFP_KERNEL)) == NULL)
return -ENOMEM; return -ENOMEM;
uart->adaptor = adaptor; uart->adaptor = adaptor;
uart->card = card; uart->card = card;

2
sound/drivers/vx/vx_core.c
View file

@ -782,7 +782,7 @@ vx_core_t *snd_vx_create(snd_card_t *card, struct snd_vx_hardware *hw,
snd_assert(card && hw && ops, return NULL); snd_assert(card && hw && ops, return NULL);
chip = kcalloc(1, sizeof(*chip) + extra_size, GFP_KERNEL); chip = kzalloc(sizeof(*chip) + extra_size, GFP_KERNEL);
if (! chip) { if (! chip) {
snd_printk(KERN_ERR "vx_core: no memory\n"); snd_printk(KERN_ERR "vx_core: no memory\n");
return NULL; return NULL;

2
sound/drivers/vx/vx_pcm.c
View file

@ -473,7 +473,7 @@ static int vx_alloc_pipe(vx_core_t *chip, int capture,
return err; return err;
/* initialize the pipe record */ /* initialize the pipe record */
pipe = kcalloc(1, sizeof(*pipe), GFP_KERNEL); pipe = kzalloc(sizeof(*pipe), GFP_KERNEL);
if (! pipe) { if (! pipe) {
/* release the pipe */ /* release the pipe */
vx_init_rmh(&rmh, CMD_FREE_PIPE); vx_init_rmh(&rmh, CMD_FREE_PIPE);

2
sound/i2c/cs8427.c
View file

@ -200,7 +200,7 @@ int snd_cs8427_create(snd_i2c_bus_t *bus,
if ((err = snd_i2c_device_create(bus, "CS8427", CS8427_ADDR | (addr & 7), &device)) < 0) if ((err = snd_i2c_device_create(bus, "CS8427", CS8427_ADDR | (addr & 7), &device)) < 0)
return err; return err;
chip = device->private_data = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = device->private_data = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) { if (chip == NULL) {
snd_i2c_device_free(device); snd_i2c_device_free(device);
return -ENOMEM; return -ENOMEM;

4
sound/i2c/i2c.c
View file

@ -81,7 +81,7 @@ int snd_i2c_bus_create(snd_card_t *card, const char *name, snd_i2c_bus_t *master
}; };
*ri2c = NULL; *ri2c = NULL;
bus = kcalloc(1, sizeof(*bus), GFP_KERNEL); bus = kzalloc(sizeof(*bus), GFP_KERNEL);
if (bus == NULL) if (bus == NULL)
return -ENOMEM; return -ENOMEM;
init_MUTEX(&bus->lock_mutex); init_MUTEX(&bus->lock_mutex);
@ -108,7 +108,7 @@ int snd_i2c_device_create(snd_i2c_bus_t *bus, const char *name, unsigned char ad
*rdevice = NULL; *rdevice = NULL;
snd_assert(bus != NULL, return -EINVAL); snd_assert(bus != NULL, return -EINVAL);
device = kcalloc(1, sizeof(*device), GFP_KERNEL); device = kzalloc(sizeof(*device), GFP_KERNEL);
if (device == NULL) if (device == NULL)
return -ENOMEM; return -ENOMEM;
device->addr = addr; device->addr = addr;

6
sound/i2c/l3/uda1341.c
View file

@ -17,7 +17,7 @@
* 2002-05-12 Tomas Kasparek another code cleanup * 2002-05-12 Tomas Kasparek another code cleanup
*/ */
/* $Id: uda1341.c,v 1.15 2005/01/03 12:05:20 tiwai Exp $ */ /* $Id: uda1341.c,v 1.16 2005/09/09 13:22:34 tiwai Exp $ */
#include <sound/driver.h> #include <sound/driver.h>
#include <linux/module.h> #include <linux/module.h>
@ -670,7 +670,7 @@ int __init snd_chip_uda1341_mixer_new(snd_card_t *card, struct l3_client **clnt)
snd_assert(card != NULL, return -EINVAL); snd_assert(card != NULL, return -EINVAL);
uda1341 = kcalloc(1, sizeof(*uda1341), GFP_KERNEL); uda1341 = kzalloc(sizeof(*uda1341), GFP_KERNEL);
if (uda1341 == NULL) if (uda1341 == NULL)
return -ENOMEM; return -ENOMEM;
@ -707,7 +707,7 @@ static int uda1341_attach(struct l3_client *clnt)
{ {
struct uda1341 *uda; struct uda1341 *uda;
uda = kcalloc(1, sizeof(*uda), 0, GFP_KERNEL); uda = kzalloc(sizeof(*uda), 0, GFP_KERNEL);
if (!uda) if (!uda)
return -ENOMEM; return -ENOMEM;

2
sound/i2c/other/ak4114.c
View file

@ -92,7 +92,7 @@ int snd_ak4114_create(snd_card_t *card,
.dev_free = snd_ak4114_dev_free, .dev_free = snd_ak4114_dev_free,
}; };
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&chip->lock); spin_lock_init(&chip->lock);

2
sound/i2c/other/ak4117.c
View file

@ -83,7 +83,7 @@ int snd_ak4117_create(snd_card_t *card, ak4117_read_t *read, ak4117_write_t *wri
.dev_free = snd_ak4117_dev_free, .dev_free = snd_ak4117_dev_free,
}; };
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&chip->lock); spin_lock_init(&chip->lock);

2
sound/i2c/tea6330t.c
View file

@ -281,7 +281,7 @@ int snd_tea6330t_update_mixer(snd_card_t * card,
u8 default_treble, default_bass; u8 default_treble, default_bass;
unsigned char bytes[7]; unsigned char bytes[7];
tea = kcalloc(1, sizeof(*tea), GFP_KERNEL); tea = kzalloc(sizeof(*tea), GFP_KERNEL);
if (tea == NULL) if (tea == NULL)
return -ENOMEM; return -ENOMEM;
if ((err = snd_i2c_device_create(bus, "TEA6330T", TEA6330T_ADDR, &device)) < 0) { if ((err = snd_i2c_device_create(bus, "TEA6330T", TEA6330T_ADDR, &device)) < 0) {

2
sound/pcmcia/pdaudiocf/pdaudiocf_core.c
View file

@ -151,7 +151,7 @@ pdacf_t *snd_pdacf_create(snd_card_t *card)
{ {
pdacf_t *chip; pdacf_t *chip;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return NULL; return NULL;
chip->card = card; chip->card = card;

2
sound/ppc/pmac.c
View file

@ -1160,7 +1160,7 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
snd_runtime_check(chip_return, return -EINVAL); snd_runtime_check(chip_return, return -EINVAL);
*chip_return = NULL; *chip_return = NULL;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
chip->card = card; chip->card = card;

2
sound/sparc/amd7930.c
View file

@ -967,7 +967,7 @@ static int __init snd_amd7930_create(snd_card_t *card,
int err; int err;
*ramd = NULL; *ramd = NULL;
amd = kcalloc(1, sizeof(*amd), GFP_KERNEL); amd = kzalloc(sizeof(*amd), GFP_KERNEL);
if (amd == NULL) if (amd == NULL)
return -ENOMEM; return -ENOMEM;

4
sound/sparc/cs4231.c
View file

@ -1969,7 +1969,7 @@ static int __init snd_cs4231_sbus_create(snd_card_t *card,
int err; int err;
*rchip = NULL; *rchip = NULL;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
@ -2083,7 +2083,7 @@ static int __init snd_cs4231_ebus_create(snd_card_t *card,
int err; int err;
*rchip = NULL; *rchip = NULL;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;

2
sound/synth/emux/emux.c
View file

@ -40,7 +40,7 @@ int snd_emux_new(snd_emux_t **remu)
snd_emux_t *emu; snd_emux_t *emu;
*remu = NULL; *remu = NULL;
emu = kcalloc(1, sizeof(*emu), GFP_KERNEL); emu = kzalloc(sizeof(*emu), GFP_KERNEL);
if (emu == NULL) if (emu == NULL)
return -ENOMEM; return -ENOMEM;

2
sound/synth/emux/emux_seq.c
View file

@ -146,7 +146,7 @@ snd_emux_create_port(snd_emux_t *emu, char *name,
int i, type, cap; int i, type, cap;
/* Allocate structures for this channel */ /* Allocate structures for this channel */
if ((p = kcalloc(1, sizeof(*p), GFP_KERNEL)) == NULL) { if ((p = kzalloc(sizeof(*p), GFP_KERNEL)) == NULL) {
snd_printk("no memory\n"); snd_printk("no memory\n");
return NULL; return NULL;
} }

8
sound/synth/emux/soundfont.c
View file

@ -266,7 +266,7 @@ newsf(snd_sf_list_t *sflist, int type, char *name)
} }
/* not found -- create a new one */ /* not found -- create a new one */
sf = kcalloc(1, sizeof(*sf), GFP_KERNEL); sf = kzalloc(sizeof(*sf), GFP_KERNEL);
if (sf == NULL) if (sf == NULL)
return NULL; return NULL;
sf->id = sflist->fonts_size; sf->id = sflist->fonts_size;
@ -346,7 +346,7 @@ sf_zone_new(snd_sf_list_t *sflist, snd_soundfont_t *sf)
{ {
snd_sf_zone_t *zp; snd_sf_zone_t *zp;
if ((zp = kcalloc(1, sizeof(*zp), GFP_KERNEL)) == NULL) if ((zp = kzalloc(sizeof(*zp), GFP_KERNEL)) == NULL)
return NULL; return NULL;
zp->next = sf->zones; zp->next = sf->zones;
sf->zones = zp; sf->zones = zp;
@ -377,7 +377,7 @@ sf_sample_new(snd_sf_list_t *sflist, snd_soundfont_t *sf)
{ {
snd_sf_sample_t *sp; snd_sf_sample_t *sp;
if ((sp = kcalloc(1, sizeof(*sp), GFP_KERNEL)) == NULL) if ((sp = kzalloc(sizeof(*sp), GFP_KERNEL)) == NULL)
return NULL; return NULL;
sp->next = sf->samples; sp->next = sf->samples;
@ -1362,7 +1362,7 @@ snd_sf_new(snd_sf_callback_t *callback, snd_util_memhdr_t *hdr)
{ {
snd_sf_list_t *sflist; snd_sf_list_t *sflist;
if ((sflist = kcalloc(1, sizeof(*sflist), GFP_KERNEL)) == NULL) if ((sflist = kzalloc(sizeof(*sflist), GFP_KERNEL)) == NULL)
return NULL; return NULL;
init_MUTEX(&sflist->presets_mutex); init_MUTEX(&sflist->presets_mutex);

2
sound/synth/util_mem.c
View file

@ -38,7 +38,7 @@ snd_util_memhdr_new(int memsize)
{ {
snd_util_memhdr_t *hdr; snd_util_memhdr_t *hdr;
hdr = kcalloc(1, sizeof(*hdr), GFP_KERNEL); hdr = kzalloc(sizeof(*hdr), GFP_KERNEL);
if (hdr == NULL) if (hdr == NULL)
return NULL; return NULL;
hdr->size = memsize; hdr->size = memsize;

2
sound/usb/usbaudio.c
View file

@ -3136,7 +3136,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
return -ENOMEM; return -ENOMEM;
} }
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (! chip) { if (! chip) {
snd_card_free(card); snd_card_free(card);
return -ENOMEM; return -ENOMEM;

6
sound/usb/usbmidi.c
View file

@ -841,7 +841,7 @@ static int snd_usbmidi_in_endpoint_create(snd_usb_midi_t* umidi,
int length; int length;
rep->in = NULL; rep->in = NULL;
ep = kcalloc(1, sizeof(*ep), GFP_KERNEL); ep = kzalloc(sizeof(*ep), GFP_KERNEL);
if (!ep) if (!ep)
return -ENOMEM; return -ENOMEM;
ep->umidi = umidi; ep->umidi = umidi;
@ -913,7 +913,7 @@ static int snd_usbmidi_out_endpoint_create(snd_usb_midi_t* umidi,
void* buffer; void* buffer;
rep->out = NULL; rep->out = NULL;
ep = kcalloc(1, sizeof(*ep), GFP_KERNEL); ep = kzalloc(sizeof(*ep), GFP_KERNEL);
if (!ep) if (!ep)
return -ENOMEM; return -ENOMEM;
ep->umidi = umidi; ep->umidi = umidi;
@ -1537,7 +1537,7 @@ int snd_usb_create_midi_interface(snd_usb_audio_t* chip,
int out_ports, in_ports; int out_ports, in_ports;
int i, err; int i, err;
umidi = kcalloc(1, sizeof(*umidi), GFP_KERNEL); umidi = kzalloc(sizeof(*umidi), GFP_KERNEL);
if (!umidi) if (!umidi)
return -ENOMEM; return -ENOMEM;
umidi->chip = chip; umidi->chip = chip;

10
sound/usb/usbmixer.c
View file

@ -824,7 +824,7 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
if (check_ignored_ctl(state, unitid, control)) if (check_ignored_ctl(state, unitid, control))
return; return;
cval = kcalloc(1, sizeof(*cval), GFP_KERNEL); cval = kzalloc(sizeof(*cval), GFP_KERNEL);
if (! cval) { if (! cval) {
snd_printk(KERN_ERR "cannot malloc kcontrol\n"); snd_printk(KERN_ERR "cannot malloc kcontrol\n");
return; return;
@ -997,7 +997,7 @@ static void build_mixer_unit_ctl(mixer_build_t *state, unsigned char *desc,
if (check_ignored_ctl(state, unitid, 0)) if (check_ignored_ctl(state, unitid, 0))
return; return;
cval = kcalloc(1, sizeof(*cval), GFP_KERNEL); cval = kzalloc(sizeof(*cval), GFP_KERNEL);
if (! cval) if (! cval)
return; return;
@ -1244,7 +1244,7 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
continue; continue;
if (check_ignored_ctl(state, unitid, valinfo->control)) if (check_ignored_ctl(state, unitid, valinfo->control))
continue; continue;
cval = kcalloc(1, sizeof(*cval), GFP_KERNEL); cval = kzalloc(sizeof(*cval), GFP_KERNEL);
if (! cval) { if (! cval) {
snd_printk(KERN_ERR "cannot malloc kcontrol\n"); snd_printk(KERN_ERR "cannot malloc kcontrol\n");
return -ENOMEM; return -ENOMEM;
@ -1430,7 +1430,7 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
if (check_ignored_ctl(state, unitid, 0)) if (check_ignored_ctl(state, unitid, 0))
return 0; return 0;
cval = kcalloc(1, sizeof(*cval), GFP_KERNEL); cval = kzalloc(sizeof(*cval), GFP_KERNEL);
if (! cval) { if (! cval) {
snd_printk(KERN_ERR "cannot malloc kcontrol\n"); snd_printk(KERN_ERR "cannot malloc kcontrol\n");
return -ENOMEM; return -ENOMEM;
@ -1945,7 +1945,7 @@ int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif)
strcpy(chip->card->mixername, "USB Mixer"); strcpy(chip->card->mixername, "USB Mixer");
mixer = kcalloc(1, sizeof(*mixer), GFP_KERNEL); mixer = kzalloc(sizeof(*mixer), GFP_KERNEL);
if (!mixer) if (!mixer)
return -ENOMEM; return -ENOMEM;
mixer->chip = chip; mixer->chip = chip;

2
sound/usb/usx2y/usbusx2yaudio.c
View file

@ -957,7 +957,7 @@ static int usX2Y_audio_stream_new(snd_card_t *card, int playback_endpoint, int c
for (i = playback_endpoint ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE; for (i = playback_endpoint ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE;
i <= SNDRV_PCM_STREAM_CAPTURE; ++i) { i <= SNDRV_PCM_STREAM_CAPTURE; ++i) {
usX2Y_substream[i] = kcalloc(1, sizeof(snd_usX2Y_substream_t), GFP_KERNEL); usX2Y_substream[i] = kzalloc(sizeof(snd_usX2Y_substream_t), GFP_KERNEL);
if (NULL == usX2Y_substream[i]) { if (NULL == usX2Y_substream[i]) {
snd_printk(KERN_ERR "cannot malloc\n"); snd_printk(KERN_ERR "cannot malloc\n");
return -ENOMEM; return -ENOMEM;