| From 48cc42973509afac24e83d6edc23901d102872d1 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Sun, 12 Apr 2020 10:13:28 +0200 |
| Subject: ALSA: usb-audio: Filter error from connector kctl ops, too |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| 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> |
| |
| --- |
| sound/usb/mixer.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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; |
