diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-04-12 10:13:28 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-21 09:06:38 +0200 |
| commit | 45b1c2cabcd591027ff785fb562fd06f51310028 (patch) | |
| tree | d51c3dd7bd8d1666d9567a0d16222a4e0d2122fb | |
| parent | ALSA: hda/realtek - Enable the headset mic on Asus FX505DT (diff) | |
| download | linux-stable-45b1c2cabcd591027ff785fb562fd06f51310028.tar.xz linux-stable-45b1c2cabcd591027ff785fb562fd06f51310028.zip | |
ALSA: usb-audio: Filter error from connector kctl ops, too
commit 48cc42973509afac24e83d6edc23901d102872d1 upstream.
The ignore_ctl_error option should filter the error at kctl accesses,
but there was an overlook: mixer_ctl_connector_get() returns an error
from the request.
This patch covers the forgotten code path and apply filter_error()
properly. The locking error is still returned since this is a fatal
error that has to be reported even with ignore_ctl_error option.
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206873
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200412081331.4742-2-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 d2a050bb8341..61ee8cd5b0c7 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1446,7 +1446,7 @@ error: usb_audio_err(chip, "cannot get connectors status: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n", UAC_GET_CUR, validx, idx, cval->val_type); - return ret; + return filter_error(cval, ret); } ucontrol->value.integer.value[0] = val; |