diff options
Diffstat (limited to 'sound/usb/usbaudio.c')
-rw-r--r-- | sound/usb/usbaudio.c | 7 |
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 }; | |||
71 | static int nrpacks = 8; /* max. number of packets per urb */ | 71 | static int nrpacks = 8; /* max. number of packets per urb */ |
72 | static int async_unlink = 1; | 72 | static int async_unlink = 1; |
73 | static int device_setup[SNDRV_CARDS]; /* device parameter for this card*/ | 73 | static int device_setup[SNDRV_CARDS]; /* device parameter for this card*/ |
74 | static int ignore_ctl_error; | ||
74 | 75 | ||
75 | module_param_array(index, int, NULL, 0444); | 76 | module_param_array(index, int, NULL, 0444); |
76 | MODULE_PARM_DESC(index, "Index value for the USB audio adapter."); | 77 | MODULE_PARM_DESC(index, "Index value for the USB audio adapter."); |
@@ -88,7 +89,9 @@ module_param(async_unlink, bool, 0444); | |||
88 | MODULE_PARM_DESC(async_unlink, "Use async unlink mode."); | 89 | MODULE_PARM_DESC(async_unlink, "Use async unlink mode."); |
89 | module_param_array(device_setup, int, NULL, 0444); | 90 | module_param_array(device_setup, int, NULL, 0444); |
90 | MODULE_PARM_DESC(device_setup, "Specific device setup (if needed)."); | 91 | MODULE_PARM_DESC(device_setup, "Specific device setup (if needed)."); |
91 | 92 | module_param(ignore_ctl_error, bool, 0444); | |
93 | MODULE_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 | } |