diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-07-08 10:55:26 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-07-08 10:55:26 -0400 |
commit | 7645054f181404e6a28c616b307c4d2562423a50 (patch) | |
tree | bcc8f969dc6f0f6e2a4acede51db5dd436a06403 /sound | |
parent | b492c4e8954d54f806875c149bbcafaa7ede7ada (diff) | |
parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/mixer.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 6939d0f517d9..736d134cc03c 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c | |||
@@ -1107,6 +1107,19 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, | |||
1107 | } | 1107 | } |
1108 | break; | 1108 | break; |
1109 | 1109 | ||
1110 | case USB_ID(0x046d, 0x0809): | ||
1111 | case USB_ID(0x046d, 0x0991): | ||
1112 | /* Most audio usb devices lie about volume resolution. | ||
1113 | * Most Logitech webcams have res = 384. | ||
1114 | * Proboly there is some logitech magic behind this number --fishor | ||
1115 | */ | ||
1116 | if (!strcmp(kctl->id.name, "Mic Capture Volume")) { | ||
1117 | snd_printk(KERN_INFO | ||
1118 | "set resolution quirk: cval->res = 384\n"); | ||
1119 | cval->res = 384; | ||
1120 | } | ||
1121 | break; | ||
1122 | |||
1110 | } | 1123 | } |
1111 | 1124 | ||
1112 | snd_printdd(KERN_INFO "[%d] FU [%s] ch = %d, val = %d/%d/%d\n", | 1125 | snd_printdd(KERN_INFO "[%d] FU [%s] ch = %d, val = %d/%d/%d\n", |