2014-12-17 22:10:10

by Chris J Arges

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

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 <[email protected]>
Signed-off-by: Chris J Arges <[email protected]>
---
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

2014-12-18 08:02:30

by Takashi Iwai

Subject: Re: [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 initialization typo

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 <[email protected]>
> Signed-off-by: Chris J Arges <[email protected]>

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
>