Skip to contentSkip to conversation

ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix

PATCH Applied Rene Herman 3 participants 3 messages Aug 4, 2008 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix

Quoted 1 line · 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.

Quoted 1 line

From 3e75fdd69c577bf29ee5a6583d479646a12c9d52 Mon Sep 17 00:00:00 2001

From: Rene Herman <[email protected]>
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.

---
 sound/isa/opti9xx/opti92x-ad1848.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
sound/isa/opti9xx/opti92x-ad1848.c +5 -3
index cb5f66b..19706b0 100644
@@ -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)
Signature · 1 line
1.5.5

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

Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · On Mon, 04 Aug 2008 05:34:47 +0200 Rene Herman <[email protected]> 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 <[email protected]>
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.

---

Quoted 41 lines
 sound/isa/opti9xx/opti92x-ad1848.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
sound/isa/opti9xx/opti92x-ad1848.c +5 -3
index cb5f66b..19706b0 100644
@@ -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)
Signature · 9 lines
1.5.5



[text/plain (161B)]
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

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

Applied
#2 lore raw

At Mon, 4 Aug 2008 06:36:04 +0200,

Quoted 10 lines · Krzysztof Helt
Quoted 6 lines · On Mon, 04 Aug 2008 05:34:47 +0200 Rene Herman <[email protected]> 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 <[email protected]>
Date: Mon, 4 Aug 2008 05:26:26 +0200
Subject: [PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix

Quoted 7 lines
Quoted 5 lines

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

---

Thanks, applied this one, too.

Takashi