diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-09-29 09:35:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-09-30 13:48:51 +0200 |
| commit | 8ec59ac3ad29891c0afef627640df36f2daa0349 (patch) | |
| tree | 6cf18ed24b466a66f56b0dcd07d06221d6511e40 /sound | |
| parent | ALSA: pcsp: Make hrtimer forwarding more robust (diff) | |
| download | linux-8ec59ac3ad29891c0afef627640df36f2daa0349.tar.xz linux-8ec59ac3ad29891c0afef627640df36f2daa0349.zip | |
ALSA: usb-audio: Fix a missing error check in scarlett gen2 mixer
The check of the returned error code is missing in
scarlett2_update_monitor_other(). Let's fix it.
Fixes: d5bda7e03982 ("ALSA: usb-audio: scarlett2: Add support for the talkback feature")
Reported-by: kernel test robot <lkp@intel.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/202109131831.9IodEzRx-lkp@intel.com
Link: https://lore.kernel.org/r/20210929073540.9611-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/mixer_scarlett_gen2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index 3d5848d5481b..53ebabf42472 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -2450,6 +2450,8 @@ static int scarlett2_update_monitor_other(struct usb_mixer_interface *mixer) err = scarlett2_usb_get_config(mixer, SCARLETT2_CONFIG_TALKBACK_MAP, 1, &bitmap); + if (err < 0) + return err; for (i = 0; i < num_mixes; i++, bitmap >>= 1) private->talkback_map[i] = bitmap & 1; } |