projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7327643
)
ALSA: usb-audio: Fix Scarlett 6i6 initialization typo
author
Chris J Arges
<
[email protected]
>
Wed, 17 Dec 2014 22:09:35 +0000
(16:09 -0600)
committer
Takashi Iwai
<
[email protected]
>
Thu, 18 Dec 2014 07:39:17 +0000
(08:39 +0100)
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]
>
Signed-off-by: Takashi Iwai <
[email protected]
>
sound/usb/mixer_scarlett.c
patch
|
blob
|
history
diff --git
a/sound/usb/mixer_scarlett.c
b/sound/usb/mixer_scarlett.c
index 9109652b88b94345103e774004d8e6ff344ff5c1..7438e7c4a842da4aac34334f13575aa765e3c79d 100644
(file)
--- 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" },