[PATCH] ALSA: usb-audio: add MAYA44 USB+ mixer control names

[PATCH] ALSA: usb-audio: add MAYA44 USB+ mixer control names

[Clemens Ladisch]

Add mixer control names for the ESI Maya44 USB+ (which appears to be
identical width the AudioTrak Maya44 USB).

Reported-by: nightmixes <nightmixes@gmail.com>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

--- a/sound/usb/mixer_maps.c
+++ b/sound/usb/mixer_maps.c
@@ -437,6 +437,11 @@ static struct usbmix_ctl_map usbmix_ctl_
 		.map = ebox44_map,
 	},
 	{
+		/* MAYA44 USB+ */
+		.id = USB_ID(0x2573, 0x0008),
+		.map = maya44_map,
+	},
+	{
 		/* KEF X300A */
 		.id = USB_ID(0x27ac, 0x1000),
 		.map = scms_usb3318_map,

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

[Clemens Ladisch]

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.

Reported-by: nightmixes <nightmixes@gmail.com>
Tested-by: nightmixes <nightmixes@gmail.com>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1583,18 +1583,15 @@ 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;
 	for (pin = 0; pin < input_pins; pin++) {
 		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)

Re: [PATCH] ALSA: usb-audio: add MAYA44 USB+ mixer control names

[Takashi Iwai]

At Wed, 03 Jun 2015 11:36:42 +0200,
Clemens Ladisch wrote:
> 
> Add mixer control names for the ESI Maya44 USB+ (which appears to be
> identical width the AudioTrak Maya44 USB).
> 
> Reported-by: nightmixes <nightmixes@gmail.com>
> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

Applied, thanks.


Takashi

> --- a/sound/usb/mixer_maps.c
> +++ b/sound/usb/mixer_maps.c
> @@ -437,6 +437,11 @@ static struct usbmix_ctl_map usbmix_ctl_
>  		.map = ebox44_map,
>  	},
>  	{
> +		/* MAYA44 USB+ */
> +		.id = USB_ID(0x2573, 0x0008),
> +		.map = maya44_map,
> +	},
> +	{
>  		/* KEF X300A */
>  		.id = USB_ID(0x27ac, 0x1000),
>  		.map = scms_usb3318_map,
> 

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

[Takashi Iwai]

At Wed, 03 Jun 2015 11:36:51 +0200,
Clemens Ladisch wrote:
> 
> 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.
> 
> Reported-by: nightmixes <nightmixes@gmail.com>
> Tested-by: nightmixes <nightmixes@gmail.com>
> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

Applied, thanks.


Takashi

> 
> --- a/sound/usb/mixer.c
> +++ b/sound/usb/mixer.c
> @@ -1583,18 +1583,15 @@ 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;
>  	for (pin = 0; pin < input_pins; pin++) {
>  		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)
>