Patch "ALSA: usb-audio: fix missing input volume controls in MAYA44 USB(+)" has been added to the 4.0-stable tree

This is a note to let you know that I've just added the patch titled

ALSA: usb-audio: fix missing input volume controls in MAYA44 USB(+)

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
alsa-usb-audio-fix-missing-input-volume-controls-in-maya44-usb.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Clemens Ladisch <[email protected]>
Date: Wed, 3 Jun 2015 11:36:51 +0200
Subject: ALSA: usb-audio: fix missing input volume controls in MAYA44 USB(+)

From: Clemens Ladisch <[email protected]>

commit ea114fc27dc0cb9a550b6add5426720feb66262a upstream.

The driver worked around an error in the MAYA44 USB(+)'s mixer unit descriptor by aborting before parsing the missing field. However, aborting parsing too early prevented parsing of the other units connected to this unit, so the capture mixer controls would be missing.

Fix this by moving the check for this descriptor error after the parsing of the unit's input pins.

---
 sound/usb/mixer.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

@@ -1583,12 +1583,6 @@ static int parse_audio_mixer_unit(struct
 			      unitid);
 		return -EINVAL;
 	}
-	/* no bmControls field (e.g. Maya44) -> ignore */
-	if (desc->bLength <= 10 + input_pins) {
-		usb_audio_dbg(state->chip, "MU %d has no bmControls field\n",
-			      unitid);
-		return 0;
-	}
 
 	num_ins = 0;
 	ich = 0;

@@ -1596,6 +1590,9 @@ static int parse_audio_mixer_unit(struct
 		err = parse_audio_unit(state, desc->baSourceID[pin]);
 		if (err < 0)
 			continue;
+		/* no bmControls field (e.g. Maya44) -> ignore */
+		if (desc->bLength <= 10 + input_pins)
+			continue;
 		err = check_input_term(state, desc->baSourceID[pin], &iterm);
 		if (err < 0)
 			return err;

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/alsa-usb-audio-add-maya44-usb-mixer-control-names.patch queue-4.0/alsa-usb-audio-fix-missing-input-volume-controls-in-maya44-usb.patch --
To unsubscribe from this list: send the line "unsubscribe stable" in