Skip to contentSkip to conversation

ALSA: usb-audio: fix CM6206 register definitions

PATCH In review Amadeusz Sławiński 3 participants 3 messages Jan 8, 2019 – Jan 11, 2019 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: usb-audio: fix CM6206 register definitions

fix typo after a recent commit causing headphones to have no sound

Fixes ad43d528a7ac (ALSA: usb-audio: Define registers for CM6206)
---
 sound/usb/quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/quirks.c +1 -1
index 96340f23f86d..ebbadb3a7094 100644
@@ -768,7 +768,7 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
 		 * REG1: PLL binary search enable, soft mute enable.
 		 */
 		CM6206_REG1_PLLBIN_EN |
-		CM6206_REG1_SOFT_MUTE_EN |
+		CM6206_REG1_SOFT_MUTE_EN,
 		/*
 		 * REG2: enable output drivers,
 		 * select front channels to the headphone output,
Signature · 1 line
2.20.1
#1 lore raw
Quoted 14 lines · Amadeusz Sławiński

fix typo after a recent commit causing headphones to have no sound

Fixes ad43d528a7ac (ALSA: usb-audio: Define registers for CM6206)
---
 sound/usb/quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/quirks.c +0 -0
index 96340f23f86d..ebbadb3a7094 100644

sound/usb/quirks.c static int snd_usb_cm6206_boot_quirk(struct usb_device *dev) · line 774

Quoted 8 lines
sound/usb/quirks.c +1 -1
@@ -768,7 +768,7 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
 		 * REG1: PLL binary search enable, soft mute enable.
 		 */
 		CM6206_REG1_PLLBIN_EN |
-		CM6206_REG1_SOFT_MUTE_EN |
+		CM6206_REG1_SOFT_MUTE_EN,
 		/*
 		 * REG2: enable output drivers,
 		 * select front channels to the headphone output,

Argh, that's a nasty error, thanks for spotting out. Applied now.

Takashi

#2 lore raw
In reply to Amadeusz Sławiński
Quoted 4 lines · Amadeusz Sławiński

fix typo after a recent commit causing headphones to have no sound

Fixes ad43d528a7ac (ALSA: usb-audio: Define registers for CM6206)

Ooops sorry for this! Thanks for fixing it!

BTW FYI what I am trying to do is get the code in workable order to get the S/PDIF in working. Right now output works, and I am going to test whether it works under windows.

Yours,
Linus Walleij
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel