aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbaudio.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/usbaudio.h')
-rw-r--r--sound/usb/usbaudio.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 7cf18c38dc42..36e4f7a29adc 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -156,11 +156,12 @@ enum quirk_type {
156 QUIRK_MIDI_RAW, 156 QUIRK_MIDI_RAW,
157 QUIRK_MIDI_EMAGIC, 157 QUIRK_MIDI_EMAGIC,
158 QUIRK_MIDI_CME, 158 QUIRK_MIDI_CME,
159 QUIRK_MIDI_US122L,
159 QUIRK_AUDIO_STANDARD_INTERFACE, 160 QUIRK_AUDIO_STANDARD_INTERFACE,
160 QUIRK_AUDIO_FIXED_ENDPOINT, 161 QUIRK_AUDIO_FIXED_ENDPOINT,
161 QUIRK_AUDIO_EDIROL_UA700_UA25,
162 QUIRK_AUDIO_EDIROL_UA1000, 162 QUIRK_AUDIO_EDIROL_UA1000,
163 QUIRK_AUDIO_EDIROL_UA101, 163 QUIRK_AUDIO_EDIROL_UA101,
164 QUIRK_AUDIO_EDIROL_UAXX,
164 165
165 QUIRK_TYPE_COUNT 166 QUIRK_TYPE_COUNT
166}; 167};
@@ -222,7 +223,8 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe,
222 __u8 request, __u8 requesttype, __u16 value, __u16 index, 223 __u8 request, __u8 requesttype, __u16 value, __u16 index,
223 void *data, __u16 size, int timeout); 224 void *data, __u16 size, int timeout);
224 225
225int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif); 226int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
227 int ignore_error);
226void snd_usb_mixer_disconnect(struct list_head *p); 228void snd_usb_mixer_disconnect(struct list_head *p);
227 229
228int snd_usb_create_midi_interface(struct snd_usb_audio *chip, struct usb_interface *iface, 230int snd_usb_create_midi_interface(struct snd_usb_audio *chip, struct usb_interface *iface,