diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-04-12 10:13:29 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-21 09:06:39 +0200 |
| commit | d127d6327339c4e1a7eeadc8a3ef87927b614b30 (patch) | |
| tree | aa0cf93c149af615a7bee4e1906b64c376466f95 | |
| parent | ALSA: usb-audio: Filter error from connector kctl ops, too (diff) | |
| download | linux-stable-d127d6327339c4e1a7eeadc8a3ef87927b614b30.tar.xz linux-stable-d127d6327339c4e1a7eeadc8a3ef87927b614b30.zip | |
ALSA: usb-audio: Don't override ignore_ctl_error value from the map
commit 3507245b82b4362dc9721cbc328644905a3efa22 upstream.
The mapping table may contain also ignore_ctl_error flag for devices
that are known to behave wild. Since this flag always writes the
card's own ignore_ctl_error flag, it overrides the value already set
by the module option, so it doesn't follow user's expectation.
Let's fix the code not to clear the flag that has been set by user.
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206873
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200412081331.4742-3-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/usb/mixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 61ee8cd5b0c7..2e808218eb2b 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3085,7 +3085,7 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer) if (map->id == state.chip->usb_id) { state.map = map->map; state.selector_map = map->selector_map; - mixer->ignore_ctl_error = map->ignore_ctl_error; + mixer->ignore_ctl_error |= map->ignore_ctl_error; break; } } |