[PATCH 5.14 003/151] ALSA: usb-audio: Fix a missing error check in scarlett gen2 mixer

From: Greg Kroah-Hartman
Date: Mon Oct 18 2021 - 09:50:46 EST


From: Takashi Iwai <tiwai@xxxxxxx>

commit 8ec59ac3ad29891c0afef627640df36f2daa0349 upstream.

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@xxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/202109131831.9IodEzRx-lkp@xxxxxxxxx
Link: https://lore.kernel.org/r/20210929073540.9611-1-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/usb/mixer_scarlett_gen2.c | 2 ++
1 file changed, 2 insertions(+)

--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -2450,6 +2450,8 @@ static int scarlett2_update_monitor_othe
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;
}