diff options
Diffstat (limited to 'sound/usb/usbmixer.c')
| -rw-r--r-- | sound/usb/usbmixer.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |
