[PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix

[PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix

[Rene Herman]

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]

I wrote:

> Firstly, snd-opti92x-ad1848 doesn't work for anything anymore. The 
> chip is each time detected as "OPTi 93x" instead of the actual AD/CS 
> chip. Probably minor buglet -- I did not look, just mechanically 
> switched cards and tested.

The attached seems to fix things.

Rene.


[-- Attachment #2: 0001-ALSA-wss_lib-opti92x-ad1848-WSS_HW_DETECT-fix.patch --]
[-- Type: text/plain, Size: 1342 bytes --]

>From 3e75fdd69c577bf29ee5a6583d479646a12c9d52 Mon Sep 17 00:00:00 2001
From: Rene Herman <rene.herman@gmail.com>
Date: Mon, 4 Aug 2008 05:26:26 +0200
Subject: [PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix

snd-opti92x-ad1848 mistakingly passes WSS_HW_OPTI93X currently. This
fixes it as tested with a OPTi 82C929A/AD1848 card.

Signed-off-by: Rene Herman <rene.herman@gmail.com>
---
 sound/isa/opti9xx/opti92x-ad1848.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index cb5f66b..19706b0 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -719,6 +719,8 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
 	chip->dma1 = dma1;
 #if defined(CS4231) || defined(OPTi93X)
 	chip->dma2 = dma2;
+#else
+	chip->dma2 = -1;
 #endif
 
 	if (chip->wss_base == SNDRV_AUTO_PORT) {
@@ -734,10 +736,10 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
 
 	error = snd_wss_create(card, chip->wss_base + 4, -1,
 			       chip->irq, chip->dma1, chip->dma2,
-#ifdef CS4231
-			       WSS_HW_DETECT, 0,
-#else /* OPTi93x */
+#ifdef OPTi93X
 			       WSS_HW_OPTI93X, WSS_HWSHARE_IRQ,
+#else
+			       WSS_HW_DETECT, 0,
 #endif
 			       &codec);
 	if (error < 0)
-- 
1.5.5


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix

[Krzysztof Helt]

On Mon, 04 Aug 2008 05:34:47 +0200
Rene Herman <rene.herman@keyaccess.nl> wrote:

> [0001-ALSA-wss_lib-opti92x-ad1848-WSS_HW_DETECT-fix.patch  text/plain (1.3KB)]
> From 3e75fdd69c577bf29ee5a6583d479646a12c9d52 Mon Sep 17 00:00:00 2001
> From: Rene Herman <rene.herman@gmail.com>
> Date: Mon, 4 Aug 2008 05:26:26 +0200
> Subject: [PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix
> 
> snd-opti92x-ad1848 mistakingly passes WSS_HW_OPTI93X currently. This
> fixes it as tested with a OPTi 82C929A/AD1848 card.
> 
> Signed-off-by: Rene Herman <rene.herman@gmail.com>
> ---

Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>


>  sound/isa/opti9xx/opti92x-ad1848.c |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
> index cb5f66b..19706b0 100644
> --- a/sound/isa/opti9xx/opti92x-ad1848.c
> +++ b/sound/isa/opti9xx/opti92x-ad1848.c
> @@ -719,6 +719,8 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
>  	chip->dma1 = dma1;
>  #if defined(CS4231) || defined(OPTi93X)
>  	chip->dma2 = dma2;
> +#else
> +	chip->dma2 = -1;
>  #endif
>  
>  	if (chip->wss_base == SNDRV_AUTO_PORT) {
> @@ -734,10 +736,10 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
>  
>  	error = snd_wss_create(card, chip->wss_base + 4, -1,
>  			       chip->irq, chip->dma1, chip->dma2,
> -#ifdef CS4231
> -			       WSS_HW_DETECT, 0,
> -#else /* OPTi93x */
> +#ifdef OPTi93X
>  			       WSS_HW_OPTI93X, WSS_HWSHARE_IRQ,
> +#else
> +			       WSS_HW_DETECT, 0,
>  #endif
>  			       &codec);
>  	if (error < 0)
> -- 
> 1.5.5
> 
> 
> 
> [text/plain (161B)]
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

----------------------------------------------------------------------
Te newsy nakreca Cie na caly dzien!
Sprawdz >>> http://link.interia.pl/f1e94

Re: [PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix

[Takashi Iwai]

At Mon, 4 Aug 2008 06:36:04 +0200,
Krzysztof Helt wrote:
> 
> On Mon, 04 Aug 2008 05:34:47 +0200
> Rene Herman <rene.herman@keyaccess.nl> wrote:
> 
> > [0001-ALSA-wss_lib-opti92x-ad1848-WSS_HW_DETECT-fix.patch  text/plain (1.3KB)]
> > From 3e75fdd69c577bf29ee5a6583d479646a12c9d52 Mon Sep 17 00:00:00 2001
> > From: Rene Herman <rene.herman@gmail.com>
> > Date: Mon, 4 Aug 2008 05:26:26 +0200
> > Subject: [PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix
> > 
> > snd-opti92x-ad1848 mistakingly passes WSS_HW_OPTI93X currently. This
> > fixes it as tested with a OPTi 82C929A/AD1848 card.
> > 
> > Signed-off-by: Rene Herman <rene.herman@gmail.com>
> > ---
> 
> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>

Thanks, applied this one, too.

Takashi