diff options
Diffstat (limited to 'sound/usb/usbaudio.h')
-rw-r--r-- | sound/usb/usbaudio.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 24d3319cc34d..1e79986b5777 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h | |||
@@ -34,9 +34,14 @@ struct snd_usb_audio { | |||
34 | int index; | 34 | int index; |
35 | struct usb_device *dev; | 35 | struct usb_device *dev; |
36 | struct snd_card *card; | 36 | struct snd_card *card; |
37 | struct usb_interface *pm_intf; | ||
37 | u32 usb_id; | 38 | u32 usb_id; |
38 | int shutdown; | 39 | struct mutex shutdown_mutex; |
40 | unsigned int shutdown:1; | ||
41 | unsigned int probing:1; | ||
42 | unsigned int autosuspended:1; | ||
39 | unsigned int txfr_quirk:1; /* Subframe boundaries on transfers */ | 43 | unsigned int txfr_quirk:1; /* Subframe boundaries on transfers */ |
44 | |||
40 | int num_interfaces; | 45 | int num_interfaces; |
41 | int num_suspended_intf; | 46 | int num_suspended_intf; |
42 | 47 | ||
@@ -70,7 +75,7 @@ enum quirk_type { | |||
70 | QUIRK_MIDI_YAMAHA, | 75 | QUIRK_MIDI_YAMAHA, |
71 | QUIRK_MIDI_MIDIMAN, | 76 | QUIRK_MIDI_MIDIMAN, |
72 | QUIRK_MIDI_NOVATION, | 77 | QUIRK_MIDI_NOVATION, |
73 | QUIRK_MIDI_FASTLANE, | 78 | QUIRK_MIDI_RAW_BYTES, |
74 | QUIRK_MIDI_EMAGIC, | 79 | QUIRK_MIDI_EMAGIC, |
75 | QUIRK_MIDI_CME, | 80 | QUIRK_MIDI_CME, |
76 | QUIRK_MIDI_AKAI, | 81 | QUIRK_MIDI_AKAI, |
@@ -79,6 +84,7 @@ enum quirk_type { | |||
79 | QUIRK_AUDIO_FIXED_ENDPOINT, | 84 | QUIRK_AUDIO_FIXED_ENDPOINT, |
80 | QUIRK_AUDIO_EDIROL_UAXX, | 85 | QUIRK_AUDIO_EDIROL_UAXX, |
81 | QUIRK_AUDIO_ALIGN_TRANSFER, | 86 | QUIRK_AUDIO_ALIGN_TRANSFER, |
87 | QUIRK_AUDIO_STANDARD_MIXER, | ||
82 | 88 | ||
83 | QUIRK_TYPE_COUNT | 89 | QUIRK_TYPE_COUNT |
84 | }; | 90 | }; |