diff mbox series

[03/11] ALSA: scarlett2: Add missing error check to scarlett2_usb_set_config()

Message ID def110c5c31dbdf0a7414d258838a0a31c0fab67.1703001053.git.g@b4.vu
State Accepted
Commit ca459dfa7d4ed9098fcf13e410963be6ae9b6bf3
Headers show
Series ALSA: scarlett2: Firmware Upgrade and Error Handling Improvements | expand

Commit Message

Geoffrey D. Bennett Dec. 19, 2023, 5:37 p.m. UTC 
scarlett2_usb_set_config() calls scarlett2_usb_get() but was not
checking the result. Return the error if it fails rather than
continuing with an invalid value.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Fixes: 9e15fae6c51a ("ALSA: usb-audio: scarlett2: Allow bit-level access to config")
---
 sound/usb/mixer_scarlett2.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c
index a0ba53372f7b..22285d8038c1 100644
--- a/sound/usb/mixer_scarlett2.c
+++ b/sound/usb/mixer_scarlett2.c
@@ -1577,7 +1577,10 @@  static int scarlett2_usb_set_config(
 		size = 1;
 		offset = config_item->offset;
 
-		scarlett2_usb_get(mixer, offset, &tmp, 1);
+		err = scarlett2_usb_get(mixer, offset, &tmp, 1);
+		if (err < 0)
+			return err;
+
 		if (value)
 			tmp |= (1 << index);
 		else