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/quirks-table.h | |
| parent | 51ab5d77dcb8a50283c0eded08c67a6d275cb910 (diff) | |
| parent | 1965c4364bdd025e9e3142592edd76addcc4bab4 (diff) | |
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/quirks-table.h')
| -rw-r--r-- | sound/usb/quirks-table.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 7a80ef31bbe4..969c79d0c688 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2707,6 +2707,23 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, +/* Lenovo ThinkStation P620 Rear Line-in, Line-out and Microphone */ +{ + USB_DEVICE(0x17aa, 0x1046), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_SETUP_DISABLE_AUTOSUSPEND + } +}, +/* Lenovo ThinkStation P620 Internal Speaker + Front Headset */ +{ + USB_DEVICE(0x17aa, 0x104d), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_SETUP_DISABLE_AUTOSUSPEND + } +}, + /* Native Instruments MK2 series */ { /* Komplete Audio 6 */ |