aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbaudio.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/usbaudio.c')
-rw-r--r--sound/usb/usbaudio.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index c91f18cdc8b5..c5cf682c352f 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -71,6 +71,7 @@ static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
71static int nrpacks = 8; /* max. number of packets per urb */ 71static int nrpacks = 8; /* max. number of packets per urb */
72static int async_unlink = 1; 72static int async_unlink = 1;
73static int device_setup[SNDRV_CARDS]; /* device parameter for this card*/ 73static int device_setup[SNDRV_CARDS]; /* device parameter for this card*/
74static int ignore_ctl_error;
74 75
75module_param_array(index, int, NULL, 0444); 76module_param_array(index, int, NULL, 0444);
76MODULE_PARM_DESC(index, "Index value for the USB audio adapter."); 77MODULE_PARM_DESC(index, "Index value for the USB audio adapter.");
@@ -88,7 +89,9 @@ module_param(async_unlink, bool, 0444);
88MODULE_PARM_DESC(async_unlink, "Use async unlink mode."); 89MODULE_PARM_DESC(async_unlink, "Use async unlink mode.");
89module_param_array(device_setup, int, NULL, 0444); 90module_param_array(device_setup, int, NULL, 0444);
90MODULE_PARM_DESC(device_setup, "Specific device setup (if needed)."); 91MODULE_PARM_DESC(device_setup, "Specific device setup (if needed).");
91 92module_param(ignore_ctl_error, bool, 0444);
93MODULE_PARM_DESC(ignore_ctl_error,
94 "Ignore errors from USB controller for mixer interfaces.");
92 95
93/* 96/*
94 * debug the h/w constraints 97 * debug the h/w constraints
@@ -3633,7 +3636,7 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
3633 if (err > 0) { 3636 if (err > 0) {
3634 /* create normal USB audio interfaces */ 3637 /* create normal USB audio interfaces */
3635 if (snd_usb_create_streams(chip, ifnum) < 0 || 3638 if (snd_usb_create_streams(chip, ifnum) < 0 ||
3636 snd_usb_create_mixer(chip, ifnum) < 0) { 3639 snd_usb_create_mixer(chip, ifnum, ignore_ctl_error) < 0) {
3637 goto __error; 3640 goto __error;
3638 } 3641 }
3639 } 3642 }