[PATCH] ALSA: usb-audio: fix broken logic in snd_audigy2nx_led_update()

[PATCH] ALSA: usb-audio: fix broken logic in snd_audigy2nx_led_update()

[Sergey Shtylyov]

When the support for the Sound Blaster X-Fi Surround 5.1 Pro was added,
the existing logic for the X-Fi Surround 5.1 in snd_audigy2nx_led_put()
was broken due to missing *else* before the added *if*: snd_usb_ctl_msg()
became incorrectly called twice and an error from first snd_usb_ctl_msg()
call ignored.  As the added snd_usb_ctl_msg() call was totally identical
to the existing one for the "plain" X-Fi Surround 5.1, just merge those
two *if* statements while fixing the broken logic...

Found by Linux Verification Center (linuxtesting.org) with the Svace static
analysis tool.

Fixes: 7cdd8d73139e ("ALSA: usb-audio - Add support for USB X-Fi S51 Pro")
Signed-off-by: Sergey Shtylyov <s.shtylyov@auroraos.dev>

---
This patch is against the master branch of Takashi Iwai's sound.git repo...

 sound/usb/mixer_quirks.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 07d5cf0077d8..ec65e8a71919 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -311,13 +311,8 @@ static int snd_audigy2nx_led_update(struct usb_mixer_interface *mixer,
 	if (pm.err < 0)
 		return pm.err;
 
-	if (chip->usb_id == USB_ID(0x041e, 0x3042))
-		err = snd_usb_ctl_msg(chip->dev,
-				      usb_sndctrlpipe(chip->dev, 0), 0x24,
-				      USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-				      !value, 0, NULL, 0);
-	/* USB X-Fi S51 Pro */
-	if (chip->usb_id == USB_ID(0x041e, 0x30df))
+	if (chip->usb_id == USB_ID(0x041e, 0x3042) ||	/* USB X-Fi S51 */
+	    chip->usb_id == USB_ID(0x041e, 0x30df))	/* USB X-Fi S51 Pro */
 		err = snd_usb_ctl_msg(chip->dev,
 				      usb_sndctrlpipe(chip->dev, 0), 0x24,
 				      USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-- 
2.52.0

Re: [PATCH] ALSA: usb-audio: fix broken logic in snd_audigy2nx_led_update()

[Takashi Iwai]

On Tue, 03 Feb 2026 17:15:57 +0100,
Sergey Shtylyov wrote:
> 
> When the support for the Sound Blaster X-Fi Surround 5.1 Pro was added,
> the existing logic for the X-Fi Surround 5.1 in snd_audigy2nx_led_put()
> was broken due to missing *else* before the added *if*: snd_usb_ctl_msg()
> became incorrectly called twice and an error from first snd_usb_ctl_msg()
> call ignored.  As the added snd_usb_ctl_msg() call was totally identical
> to the existing one for the "plain" X-Fi Surround 5.1, just merge those
> two *if* statements while fixing the broken logic...
> 
> Found by Linux Verification Center (linuxtesting.org) with the Svace static
> analysis tool.
> 
> Fixes: 7cdd8d73139e ("ALSA: usb-audio - Add support for USB X-Fi S51 Pro")
> Signed-off-by: Sergey Shtylyov <s.shtylyov@auroraos.dev>

Applied now.  Thanks.


Takashi