diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-13 15:40:53 +0200 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-15 11:48:01 +0200 |
commit | 7a9b8063cf7d78d7de4f2555357101087548c699 (patch) | |
tree | e52206406078301f572057597ba45eb0a7a413ca /sound/usb/usbmixer.c | |
parent | 8a8f2662c535e1dedced896cc68cb8473fd98fa0 (diff) | |
download | linux-7a9b8063cf7d78d7de4f2555357101087548c699.tar.gz linux-7a9b8063cf7d78d7de4f2555357101087548c699.tar.bz2 linux-7a9b8063cf7d78d7de4f2555357101087548c699.zip |
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>
Diffstat (limited to 'sound/usb/usbmixer.c')
-rw-r--r-- | sound/usb/usbmixer.c | 7 |
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, } } -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); |