* [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 initialization typo
@ 2014-12-17 22:09 Chris J Arges
2014-12-18 8:02 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Chris J Arges @ 2014-12-17 22:09 UTC (permalink / raw)
To: alsa-devel
Cc: Chris J Arges, Jaroslav Kysela, Takashi Iwai, alsa-devel, linux-kernel
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@gmail.com>
Signed-off-by: Chris J Arges <chris.j.arges@canonical.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 initialization typo
2014-12-17 22:09 [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 initialization typo Chris J Arges
@ 2014-12-18 8:02 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2014-12-18 8:02 UTC (permalink / raw)
To: Chris J Arges; +Cc: alsa-devel, Jaroslav Kysela, alsa-devel, linux-kernel
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@gmail.com>
> Signed-off-by: Chris J Arges <chris.j.arges@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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-18 8:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-17 22:09 [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 initialization typo Chris J Arges
2014-12-18 8:02 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®