[alsa-devel] [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 initialization typo

Takashi Iwai tiwai at suse.de
Thu Dec 18 09:02:26 CET 2014


At Wed, 17 Dec 2014 16:09:35 -0600,
Chris J Arges wrote:
> 
> The num_controls field was incorrectly set to 0 causing 6i6 to not be
> initialized. Set this to 9.
> 
> Reported-and-tested-by: Mark Roberts <sunifiram at gmail.com>
> Signed-off-by: Chris J Arges <chris.j.arges at canonical.com>

Applied, thanks.


Takashi

> ---
>  sound/usb/mixer_scarlett.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/usb/mixer_scarlett.c b/sound/usb/mixer_scarlett.c
> index 9109652..7438e7c 100644
> --- a/sound/usb/mixer_scarlett.c
> +++ b/sound/usb/mixer_scarlett.c
> @@ -655,7 +655,7 @@ static struct scarlett_device_info s6i6_info = {
>  		.names = NULL
>  	},
>  
> -	.num_controls = 0,
> +	.num_controls = 9,
>  	.controls = {
>  		{ .num = 0, .type = SCARLETT_OUTPUTS, .name = "Monitor" },
>  		{ .num = 1, .type = SCARLETT_OUTPUTS, .name = "Headphone" },
> -- 
> 1.9.1
> 
--
To unsubscribe from this list: send the line "unsubscribe alsa-devel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



More information about the Alsa-devel mailing list