aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbmixer.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/usbmixer.c')
-rw-r--r--sound/usb/usbmixer.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 6621fad8c5f0..a49246113e75 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -2014,7 +2014,8 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry,
2014 } 2014 }
2015} 2015}
2016 2016
2017int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif) 2017int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
2018 int ignore_error)
2018{ 2019{
2019 static struct snd_device_ops dev_ops = { 2020 static struct snd_device_ops dev_ops = {
2020 .dev_free = snd_usb_mixer_dev_free 2021 .dev_free = snd_usb_mixer_dev_free
@@ -2029,9 +2030,7 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
2029 return -ENOMEM; 2030 return -ENOMEM;
2030 mixer->chip = chip; 2031 mixer->chip = chip;
2031 mixer->ctrlif = ctrlif; 2032 mixer->ctrlif = ctrlif;
2032#ifdef IGNORE_CTL_ERROR 2033 mixer->ignore_ctl_error = ignore_error;
2033 mixer->ignore_ctl_error = 1;
2034#endif
2035 mixer->id_elems = kcalloc(256, sizeof(*mixer->id_elems), GFP_KERNEL); 2034 mixer->id_elems = kcalloc(256, sizeof(*mixer->id_elems), GFP_KERNEL);
2036 if (!mixer->id_elems) { 2035 if (!mixer->id_elems) {
2037 kfree(mixer); 2036 kfree(mixer);