28 files changed, 43 insertions, 43 deletions

diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index 813959f185e6..6ee912259cc5 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -21,7 +21,7 @@
  *                              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)
                 return -ENOMEM;
 
-        sa11xx_uda1341 = kcalloc(1, sizeof(*sa11xx_uda1341), GFP_KERNEL);
+        sa11xx_uda1341 = kzalloc(sizeof(*sa11xx_uda1341), GFP_KERNEL);
         if (sa11xx_uda1341 == NULL)
                 return -ENOMEM; 
         spin_lock_init(&chip->s[0].dma_lock);
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 977d98d26a81..64ef7f62851d 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -337,7 +337,7 @@ static int snd_card_dummy_playback_open(snd_pcm_substream_t * substream)
         snd_card_dummy_pcm_t *dpcm;
         int err;
 
-        dpcm = kcalloc(1, sizeof(*dpcm), GFP_KERNEL);
+        dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
         if (dpcm == NULL)
                 return -ENOMEM;
         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;
         int err;
 
-        dpcm = kcalloc(1, sizeof(*dpcm), GFP_KERNEL);
+        dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
         if (dpcm == NULL)
                 return -ENOMEM;
         init_timer(&dpcm->timer);
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index 0f83c5241b6b..fe3f921ffbe3 100644
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -463,7 +463,7 @@ int snd_mpu401_uart_new(snd_card_t * card, int device,
                 *rrawmidi = NULL;
         if ((err = snd_rawmidi_new(card, "MPU-401U", device, 1, 1, &rmidi)) < 0)
                 return err;
-        mpu = kcalloc(1, sizeof(*mpu), GFP_KERNEL);
+        mpu = kzalloc(sizeof(*mpu), GFP_KERNEL);
         if (mpu == NULL) {
                 snd_device_free(card, rmidi);
                 return -ENOMEM;
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index b8199d20be82..3a25c89d2983 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -688,7 +688,7 @@ static int snd_mtpav_get_RAWMIDI(mtpav_t * mcard)
 
 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) {
                 spin_lock_init(&ncrd->spinlock);
 
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index c313e5205cb8..1f84d78260de 100644
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -354,7 +354,7 @@ int snd_opl3_new(snd_card_t *card,
         int err;
 
         *ropl3 = NULL;
-        opl3 = kcalloc(1, sizeof(*opl3), GFP_KERNEL);
+        opl3 = kzalloc(sizeof(*opl3), GFP_KERNEL);
         if (opl3 == NULL)
                 return -ENOMEM;
 
diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c
index 33da334ae981..21a2b409d6d3 100644
--- a/sound/drivers/opl3/opl3_oss.c
+++ b/sound/drivers/opl3/opl3_oss.c
@@ -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);
-                put = kcalloc(1, size, GFP_KERNEL);
+                put = kzalloc(size, GFP_KERNEL);
                 if (put == NULL)
                         return -ENOMEM;
                 /* build header */
diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
index 8261464dade8..380c2c704c54 100644
--- a/sound/drivers/opl4/opl4_lib.c
+++ b/sound/drivers/opl4/opl4_lib.c
@@ -204,7 +204,7 @@ int snd_opl4_create(snd_card_t *card,
         if (ropl4)
                 *ropl4 = NULL;
 
-        opl4 = kcalloc(1, sizeof(*opl4), GFP_KERNEL);
+        opl4 = kzalloc(sizeof(*opl4), GFP_KERNEL);
         if (!opl4)
                 return -ENOMEM;
 
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index fd3bb9dd1d24..416172ea1f47 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -779,7 +779,7 @@ static int __init snd_uart16550_create(snd_card_t * card,
         int err;
 
 
-        if ((uart = kcalloc(1, sizeof(*uart), GFP_KERNEL)) == NULL)
+        if ((uart = kzalloc(sizeof(*uart), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
         uart->adaptor = adaptor;
         uart->card = card;
diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c
index c6fa5afa3e9a..4697b1d75cbb 100644
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
@@ -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);
 
-        chip = kcalloc(1, sizeof(*chip) + extra_size, GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip) + extra_size, GFP_KERNEL);
         if (! chip) {
                 snd_printk(KERN_ERR "vx_core: no memory\n");
                 return NULL;
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index d4becf44e247..c2312d912fc7 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -473,7 +473,7 @@ static int vx_alloc_pipe(vx_core_t *chip, int capture,
                 return err;
 
         /* initialize the pipe record */
-        pipe = kcalloc(1, sizeof(*pipe), GFP_KERNEL);
+        pipe = kzalloc(sizeof(*pipe), GFP_KERNEL);
         if (! pipe) {
                 /* release the pipe */
                 vx_init_rmh(&rmh, CMD_FREE_PIPE);
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c
index a3fda859dd15..a21f7d541f86 100644
--- a/sound/i2c/cs8427.c
+++ b/sound/i2c/cs8427.c
@@ -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)
                 return err;
-        chip = device->private_data = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = device->private_data = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL) {
                 snd_i2c_device_free(device);
                 return -ENOMEM;
diff --git a/sound/i2c/i2c.c b/sound/i2c/i2c.c
index e8fa7e1a68e8..e4e505b9d88b 100644
--- a/sound/i2c/i2c.c
+++ b/sound/i2c/i2c.c
@@ -81,7 +81,7 @@ int snd_i2c_bus_create(snd_card_t *card, const char *name, snd_i2c_bus_t *master
         };
 
         *ri2c = NULL;
-        bus = kcalloc(1, sizeof(*bus), GFP_KERNEL);
+        bus = kzalloc(sizeof(*bus), GFP_KERNEL);
         if (bus == NULL)
                 return -ENOMEM;
         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;
         snd_assert(bus != NULL, return -EINVAL);
-        device = kcalloc(1, sizeof(*device), GFP_KERNEL);
+        device = kzalloc(sizeof(*device), GFP_KERNEL);
         if (device == NULL)
                 return -ENOMEM;
         device->addr = addr;
diff --git a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c
index e13122f3fc50..103a7dcd0dde 100644
--- a/sound/i2c/l3/uda1341.c
+++ b/sound/i2c/l3/uda1341.c
@@ -17,7 +17,7 @@
  * 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 <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);
 
-        uda1341 = kcalloc(1, sizeof(*uda1341), GFP_KERNEL);
+        uda1341 = kzalloc(sizeof(*uda1341), GFP_KERNEL);
         if (uda1341 == NULL)
                 return -ENOMEM;
          
@@ -707,7 +707,7 @@ static int uda1341_attach(struct l3_client *clnt)
 {
         struct uda1341 *uda;
 
-        uda = kcalloc(1, sizeof(*uda), 0, GFP_KERNEL);
+        uda = kzalloc(sizeof(*uda), 0, GFP_KERNEL);
         if (!uda)
                 return -ENOMEM;
 
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c
index 5adde308a00f..af5eadcddd92 100644
--- a/sound/i2c/other/ak4114.c
+++ b/sound/i2c/other/ak4114.c
@@ -92,7 +92,7 @@ int snd_ak4114_create(snd_card_t *card,
                 .dev_free =     snd_ak4114_dev_free,
         };
 
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
                 return -ENOMEM;
         spin_lock_init(&chip->lock);
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c
index 0419c4336a55..d51b51dd86d6 100644
--- a/sound/i2c/other/ak4117.c
+++ b/sound/i2c/other/ak4117.c
@@ -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,
         };
 
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
                 return -ENOMEM;
         spin_lock_init(&chip->lock);
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c
index 2da8d7f157f4..fd65da654267 100644
--- a/sound/i2c/tea6330t.c
+++ b/sound/i2c/tea6330t.c
@@ -281,7 +281,7 @@ int snd_tea6330t_update_mixer(snd_card_t * card,
         u8 default_treble, default_bass;
         unsigned char bytes[7];
 
-        tea = kcalloc(1, sizeof(*tea), GFP_KERNEL);
+        tea = kzalloc(sizeof(*tea), GFP_KERNEL);
         if (tea == NULL)
                 return -ENOMEM;
         if ((err = snd_i2c_device_create(bus, "TEA6330T", TEA6330T_ADDR, &device)) < 0) {
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
index a2132e3763dd..0208c54896b3 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
@@ -151,7 +151,7 @@ pdacf_t *snd_pdacf_create(snd_card_t *card)
 {
         pdacf_t *chip;
 
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
                 return NULL;
         chip->card = card;
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 9774e568ee08..e35b48d29c45 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -1160,7 +1160,7 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
         snd_runtime_check(chip_return, return -EINVAL);
         *chip_return = NULL;
 
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
                 return -ENOMEM;
         chip->card = card;
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index ed0d5f2f0888..46d504ba7e03 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -967,7 +967,7 @@ static int __init snd_amd7930_create(snd_card_t *card,
         int err;
 
         *ramd = NULL;
-        amd = kcalloc(1, sizeof(*amd), GFP_KERNEL);
+        amd = kzalloc(sizeof(*amd), GFP_KERNEL);
         if (amd == NULL)
                 return -ENOMEM;
 
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index bd169f541181..2fb27c4e951f 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1969,7 +1969,7 @@ static int __init snd_cs4231_sbus_create(snd_card_t *card,
         int err;
 
         *rchip = NULL;
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
                 return -ENOMEM;
 
@@ -2083,7 +2083,7 @@ static int __init snd_cs4231_ebus_create(snd_card_t *card,
         int err;
 
         *rchip = NULL;
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
                 return -ENOMEM;
 
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index 60d0b2c66698..9e2b4c0c8a8a 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -40,7 +40,7 @@ int snd_emux_new(snd_emux_t **remu)
         snd_emux_t *emu;
 
         *remu = NULL;
-        emu = kcalloc(1, sizeof(*emu), GFP_KERNEL);
+        emu = kzalloc(sizeof(*emu), GFP_KERNEL);
         if (emu == NULL)
                 return -ENOMEM;
 
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index e41b28d9bf52..8ccd33f4aa57 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -146,7 +146,7 @@ snd_emux_create_port(snd_emux_t *emu, char *name,
         int i, type, cap;
 
         /* 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");
                 return NULL;
         }
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c
index 901a7db05bde..d0925ea50838 100644
--- a/sound/synth/emux/soundfont.c
+++ b/sound/synth/emux/soundfont.c
@@ -266,7 +266,7 @@ newsf(snd_sf_list_t *sflist, int type, char *name)
         }
 
         /* not found -- create a new one */
-        sf = kcalloc(1, sizeof(*sf), GFP_KERNEL);
+        sf = kzalloc(sizeof(*sf), GFP_KERNEL);
         if (sf == NULL)
                 return NULL;
         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;
 
-        if ((zp = kcalloc(1, sizeof(*zp), GFP_KERNEL)) == NULL)
+        if ((zp = kzalloc(sizeof(*zp), GFP_KERNEL)) == NULL)
                 return NULL;
         zp->next = sf->zones;
         sf->zones = zp;
@@ -377,7 +377,7 @@ sf_sample_new(snd_sf_list_t *sflist, snd_soundfont_t *sf)
 {
         snd_sf_sample_t *sp;
 
-        if ((sp = kcalloc(1, sizeof(*sp), GFP_KERNEL)) == NULL)
+        if ((sp = kzalloc(sizeof(*sp), GFP_KERNEL)) == NULL)
                 return NULL;
 
         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;
 
-        if ((sflist = kcalloc(1, sizeof(*sflist), GFP_KERNEL)) == NULL)
+        if ((sflist = kzalloc(sizeof(*sflist), GFP_KERNEL)) == NULL)
                 return NULL;
 
         init_MUTEX(&sflist->presets_mutex);
diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c
index 8b131a11e549..5f75bf31bc36 100644
--- a/sound/synth/util_mem.c
+++ b/sound/synth/util_mem.c
@@ -38,7 +38,7 @@ snd_util_memhdr_new(int memsize)
 {
         snd_util_memhdr_t *hdr;
 
-        hdr = kcalloc(1, sizeof(*hdr), GFP_KERNEL);
+        hdr = kzalloc(sizeof(*hdr), GFP_KERNEL);
         if (hdr == NULL)
                 return NULL;
         hdr->size = memsize;
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index da22f25d4efd..d5ae2055b896 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -3136,7 +3136,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
                 return -ENOMEM;
         }
 
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (! chip) {
                 snd_card_free(card);
                 return -ENOMEM;
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 93dedde3c428..e0d0365453b3 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -841,7 +841,7 @@ static int snd_usbmidi_in_endpoint_create(snd_usb_midi_t* umidi,
         int length;
 
         rep->in = NULL;
-        ep = kcalloc(1, sizeof(*ep), GFP_KERNEL);
+        ep = kzalloc(sizeof(*ep), GFP_KERNEL);
         if (!ep)
                 return -ENOMEM;
         ep->umidi = umidi;
@@ -913,7 +913,7 @@ static int snd_usbmidi_out_endpoint_create(snd_usb_midi_t* umidi,
         void* buffer;
 
         rep->out = NULL;
-        ep = kcalloc(1, sizeof(*ep), GFP_KERNEL);
+        ep = kzalloc(sizeof(*ep), GFP_KERNEL);
         if (!ep)
                 return -ENOMEM;
         ep->umidi = umidi;
@@ -1537,7 +1537,7 @@ int snd_usb_create_midi_interface(snd_usb_audio_t* chip,
         int out_ports, in_ports;
         int i, err;
 
-        umidi = kcalloc(1, sizeof(*umidi), GFP_KERNEL);
+        umidi = kzalloc(sizeof(*umidi), GFP_KERNEL);
         if (!umidi)
                 return -ENOMEM;
         umidi->chip = chip;
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index fa7056f5caaf..c3c08c9cb46e 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -824,7 +824,7 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
         if (check_ignored_ctl(state, unitid, control))
                 return;
 
-        cval = kcalloc(1, sizeof(*cval), GFP_KERNEL);
+        cval = kzalloc(sizeof(*cval), GFP_KERNEL);
         if (! cval) {
                 snd_printk(KERN_ERR "cannot malloc kcontrol\n");
                 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))
                 return;
 
-        cval = kcalloc(1, sizeof(*cval), GFP_KERNEL);
+        cval = kzalloc(sizeof(*cval), GFP_KERNEL);
         if (! cval)
                 return;
 
@@ -1244,7 +1244,7 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
                         continue;
                 if (check_ignored_ctl(state, unitid, valinfo->control))
                         continue;
-                cval = kcalloc(1, sizeof(*cval), GFP_KERNEL);
+                cval = kzalloc(sizeof(*cval), GFP_KERNEL);
                 if (! cval) {
                         snd_printk(KERN_ERR "cannot malloc kcontrol\n");
                         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))
                 return 0;
 
-        cval = kcalloc(1, sizeof(*cval), GFP_KERNEL);
+        cval = kzalloc(sizeof(*cval), GFP_KERNEL);
         if (! cval) {
                 snd_printk(KERN_ERR "cannot malloc kcontrol\n");
                 return -ENOMEM;
@@ -1945,7 +1945,7 @@ int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif)
 
         strcpy(chip->card->mixername, "USB Mixer");
 
-        mixer = kcalloc(1, sizeof(*mixer), GFP_KERNEL);
+        mixer = kzalloc(sizeof(*mixer), GFP_KERNEL);
         if (!mixer)
                 return -ENOMEM;
         mixer->chip = chip;
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 62dfd28b3b07..0f09e0de52dd 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -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;
              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]) {
                         snd_printk(KERN_ERR "cannot malloc\n");
                         return -ENOMEM;