diff options
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbaudio.c | 2 | ||||
-rw-r--r-- | sound/usb/usbmidi.c | 6 | ||||
-rw-r--r-- | sound/usb/usbmixer.c | 10 | ||||
-rw-r--r-- | sound/usb/usx2y/usbusx2yaudio.c | 2 |
4 files changed, 10 insertions, 10 deletions
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, | |||
3136 | return -ENOMEM; | 3136 | return -ENOMEM; |
3137 | } | 3137 | } |
3138 | 3138 | ||
3139 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 3139 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
3140 | if (! chip) { | 3140 | if (! chip) { |
3141 | snd_card_free(card); | 3141 | snd_card_free(card); |
3142 | return -ENOMEM; | 3142 | 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, | |||
841 | int length; | 841 | int length; |
842 | 842 | ||
843 | rep->in = NULL; | 843 | rep->in = NULL; |
844 | ep = kcalloc(1, sizeof(*ep), GFP_KERNEL); | 844 | ep = kzalloc(sizeof(*ep), GFP_KERNEL); |
845 | if (!ep) | 845 | if (!ep) |
846 | return -ENOMEM; | 846 | return -ENOMEM; |
847 | ep->umidi = umidi; | 847 | ep->umidi = umidi; |
@@ -913,7 +913,7 @@ static int snd_usbmidi_out_endpoint_create(snd_usb_midi_t* umidi, | |||
913 | void* buffer; | 913 | void* buffer; |
914 | 914 | ||
915 | rep->out = NULL; | 915 | rep->out = NULL; |
916 | ep = kcalloc(1, sizeof(*ep), GFP_KERNEL); | 916 | ep = kzalloc(sizeof(*ep), GFP_KERNEL); |
917 | if (!ep) | 917 | if (!ep) |
918 | return -ENOMEM; | 918 | return -ENOMEM; |
919 | ep->umidi = umidi; | 919 | ep->umidi = umidi; |
@@ -1537,7 +1537,7 @@ int snd_usb_create_midi_interface(snd_usb_audio_t* chip, | |||
1537 | int out_ports, in_ports; | 1537 | int out_ports, in_ports; |
1538 | int i, err; | 1538 | int i, err; |
1539 | 1539 | ||
1540 | umidi = kcalloc(1, sizeof(*umidi), GFP_KERNEL); | 1540 | umidi = kzalloc(sizeof(*umidi), GFP_KERNEL); |
1541 | if (!umidi) | 1541 | if (!umidi) |
1542 | return -ENOMEM; | 1542 | return -ENOMEM; |
1543 | umidi->chip = chip; | 1543 | 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, | |||
824 | if (check_ignored_ctl(state, unitid, control)) | 824 | if (check_ignored_ctl(state, unitid, control)) |
825 | return; | 825 | return; |
826 | 826 | ||
827 | cval = kcalloc(1, sizeof(*cval), GFP_KERNEL); | 827 | cval = kzalloc(sizeof(*cval), GFP_KERNEL); |
828 | if (! cval) { | 828 | if (! cval) { |
829 | snd_printk(KERN_ERR "cannot malloc kcontrol\n"); | 829 | snd_printk(KERN_ERR "cannot malloc kcontrol\n"); |
830 | return; | 830 | return; |
@@ -997,7 +997,7 @@ static void build_mixer_unit_ctl(mixer_build_t *state, unsigned char *desc, | |||
997 | if (check_ignored_ctl(state, unitid, 0)) | 997 | if (check_ignored_ctl(state, unitid, 0)) |
998 | return; | 998 | return; |
999 | 999 | ||
1000 | cval = kcalloc(1, sizeof(*cval), GFP_KERNEL); | 1000 | cval = kzalloc(sizeof(*cval), GFP_KERNEL); |
1001 | if (! cval) | 1001 | if (! cval) |
1002 | return; | 1002 | return; |
1003 | 1003 | ||
@@ -1244,7 +1244,7 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char | |||
1244 | continue; | 1244 | continue; |
1245 | if (check_ignored_ctl(state, unitid, valinfo->control)) | 1245 | if (check_ignored_ctl(state, unitid, valinfo->control)) |
1246 | continue; | 1246 | continue; |
1247 | cval = kcalloc(1, sizeof(*cval), GFP_KERNEL); | 1247 | cval = kzalloc(sizeof(*cval), GFP_KERNEL); |
1248 | if (! cval) { | 1248 | if (! cval) { |
1249 | snd_printk(KERN_ERR "cannot malloc kcontrol\n"); | 1249 | snd_printk(KERN_ERR "cannot malloc kcontrol\n"); |
1250 | return -ENOMEM; | 1250 | return -ENOMEM; |
@@ -1430,7 +1430,7 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned | |||
1430 | if (check_ignored_ctl(state, unitid, 0)) | 1430 | if (check_ignored_ctl(state, unitid, 0)) |
1431 | return 0; | 1431 | return 0; |
1432 | 1432 | ||
1433 | cval = kcalloc(1, sizeof(*cval), GFP_KERNEL); | 1433 | cval = kzalloc(sizeof(*cval), GFP_KERNEL); |
1434 | if (! cval) { | 1434 | if (! cval) { |
1435 | snd_printk(KERN_ERR "cannot malloc kcontrol\n"); | 1435 | snd_printk(KERN_ERR "cannot malloc kcontrol\n"); |
1436 | return -ENOMEM; | 1436 | return -ENOMEM; |
@@ -1945,7 +1945,7 @@ int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif) | |||
1945 | 1945 | ||
1946 | strcpy(chip->card->mixername, "USB Mixer"); | 1946 | strcpy(chip->card->mixername, "USB Mixer"); |
1947 | 1947 | ||
1948 | mixer = kcalloc(1, sizeof(*mixer), GFP_KERNEL); | 1948 | mixer = kzalloc(sizeof(*mixer), GFP_KERNEL); |
1949 | if (!mixer) | 1949 | if (!mixer) |
1950 | return -ENOMEM; | 1950 | return -ENOMEM; |
1951 | mixer->chip = chip; | 1951 | 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 | |||
957 | 957 | ||
958 | for (i = playback_endpoint ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE; | 958 | for (i = playback_endpoint ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE; |
959 | i <= SNDRV_PCM_STREAM_CAPTURE; ++i) { | 959 | i <= SNDRV_PCM_STREAM_CAPTURE; ++i) { |
960 | usX2Y_substream[i] = kcalloc(1, sizeof(snd_usX2Y_substream_t), GFP_KERNEL); | 960 | usX2Y_substream[i] = kzalloc(sizeof(snd_usX2Y_substream_t), GFP_KERNEL); |
961 | if (NULL == usX2Y_substream[i]) { | 961 | if (NULL == usX2Y_substream[i]) { |
962 | snd_printk(KERN_ERR "cannot malloc\n"); | 962 | snd_printk(KERN_ERR "cannot malloc\n"); |
963 | return -ENOMEM; | 963 | return -ENOMEM; |