diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-08-23 13:19:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-08-23 13:20:34 +0200 |
| commit | ee15d9b84ccb1c66fd8616257eb2a03b3ec79540 (patch) | |
| tree | c8d76be788741c5389fb6bb785507a1f35ac8e07 /sound/usb/usbaudio.h | |
| parent | ALSA: usb-audio: Properly match with audio interface class (diff) | |
| parent | ALSA: usb-audio: Disable autosuspend for Lenovo ThinkStation P620 (diff) | |
| download | linux-dev-ee15d9b84ccb1c66fd8616257eb2a03b3ec79540.tar.xz linux-dev-ee15d9b84ccb1c66fd8616257eb2a03b3ec79540.zip | |
Merge branch 'for-linus' into for-next
Correct quirk table entries for Lenovo ThinkStation P620, too.
The name and profile strings are now set from a different table, hence
removed.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usbaudio.h')
| -rw-r--r-- | sound/usb/usbaudio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 2275295fe71f..0805b7f21272 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -102,6 +102,7 @@ enum quirk_type { QUIRK_AUDIO_ALIGN_TRANSFER, QUIRK_AUDIO_STANDARD_MIXER, QUIRK_SETUP_FMT_AFTER_RESUME, + QUIRK_SETUP_DISABLE_AUTOSUSPEND, QUIRK_TYPE_COUNT }; |