ALSA: usb-audio - Add ignore_ctl_error parameter

Added the ignore_ctl_error parameter to enable/disable the control-error
handling for mixer interfaces.  It was a hard-coded ifdef, and now you
can change it more easily.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 3 insertions, 4 deletions

diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 6621fad8c5f..a49246113e7 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,
         }
 }
 
-int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
+int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
+                         int ignore_error)
 {
         static struct snd_device_ops dev_ops = {
                 .dev_free = snd_usb_mixer_dev_free
@@ -2029,9 +2030,7 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
                 return -ENOMEM;
         mixer->chip = chip;
         mixer->ctrlif = ctrlif;
-#ifdef IGNORE_CTL_ERROR
-        mixer->ignore_ctl_error = 1;
-#endif
+        mixer->ignore_ctl_error = ignore_error;
         mixer->id_elems = kcalloc(256, sizeof(*mixer->id_elems), GFP_KERNEL);
         if (!mixer->id_elems) {
                 kfree(mixer);