diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-04-12 10:13:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-04-12 10:14:54 +0200 |
| commit | 934b96594ed66b07dbc7e576d28814466df3a494 (patch) | |
| tree | cc03821e20caedcbb12b33bc0d09954f383a6046 /sound/usb/mixer_maps.c | |
| parent | ALSA: usb-audio: Don't create jack controls for PCM terminals (diff) | |
| download | wireguard-linux-934b96594ed66b07dbc7e576d28814466df3a494.tar.xz wireguard-linux-934b96594ed66b07dbc7e576d28814466df3a494.zip | |
ALSA: usb-audio: Check mapping at creating connector controls, too
Add the mapping check to build_connector_control() so that the device
specific quirk can provide the node to skip for the badly behaving
connector controls. As an example, ALC1220-VB-based codec implements
the skip entry for the broken SPDIF connector detection.
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206873
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200412081331.4742-5-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | sound/usb/mixer_maps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index 72b575c34860..b4e77000f441 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -360,9 +360,11 @@ static const struct usbmix_name_map corsair_virtuoso_map[] = { }; /* Some mobos shipped with a dummy HD-audio show the invalid GET_MIN/GET_MAX - * response for Input Gain Pad (id=19, control=12). Skip it. + * response for Input Gain Pad (id=19, control=12) and the connector status + * for SPDIF terminal (id=18). Skip them. */ static const struct usbmix_name_map asus_rog_map[] = { + { 18, NULL }, /* OT, connector control */ { 19, NULL, 12 }, /* FU, Input Gain Pad */ {} }; |