| From d5f3f55964dd5b6fe07cbfea87bb35f84284e444 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Sun, 12 Apr 2020 10:13:29 +0200 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c |
| index a7dfb4fead47..52cdc5c4593a 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; |
| } |
| } |
| -- |
| 2.7.4 |
| |
