[PATCH] ALSA: usb-audio: fix CM6206 register definitions

[PATCH] ALSA: usb-audio: fix CM6206 register definitions

[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)
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
 sound/usb/quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 96340f23f86d..ebbadb3a7094 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -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,
-- 
2.20.1

Re: [PATCH] ALSA: usb-audio: fix CM6206 register definitions

[Takashi Iwai]

On Tue, 08 Jan 2019 21:03:11 +0100,
Amadeusz Sławiński wrote:
> 
> fix typo after a recent commit causing headphones to have no sound
> 
> Fixes: ad43d528a7ac (ALSA: usb-audio: Define registers for CM6206)
> Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
> ---
>  sound/usb/quirks.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
> index 96340f23f86d..ebbadb3a7094 100644
> --- a/sound/usb/quirks.c
> +++ b/sound/usb/quirks.c
> @@ -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

Re: [PATCH] ALSA: usb-audio: fix CM6206 register definitions

[Linus Walleij]

On Tue, Jan 8, 2019 at 9:02 PM Amadeusz Sławiński <amade@asmblr.net> wrote:

> fix typo after a recent commit causing headphones to have no sound
>
> Fixes: ad43d528a7ac (ALSA: usb-audio: Define registers for CM6206)
> Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>

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