On 17-07-08 21:38, Rene Herman wrote:
On 17-07-08 21:20, Rene Herman wrote:
On 17-07-08 20:40, Takashi Iwai wrote:
Could you try the patch below?
No, please hang on, it's much simpler. Above commit isn't actually
itself guilty. Have a patch ready, but am testing a bit.
I retract that. Your patch should fix things.
It does. Acked/Tested-by: Rene Herman <rene.herman@xxxxxxxxx>
I would like to place something on top to make the init isa/pnp choice
look more generic but I'll submit that tomorrow.
This bug was uncovered by !CONFIG_PNP and we had trouble in this driver
due to that before so was rewriting the init to be a generic multi-card
ALSA init but, actually, not much point.
The hardware fundamentally doesn't support more than one card per system
due to the fixed chip->mc_base and the bug was in this case not _caused_
but only uncovered by !CONFIG_PNP (it triggers for CONFIG_PNP after
supplying "isapnp=0" as a module param) so I'll just wait for the next
time this ifdeffed together mess breaks on !CONFIG_PNP to make the init
look generic ;-)
In fact, in the meantime I'll look at splitting 92x and 93x again. It's
much better now that Krzysztof made it use the generic library code but
I still hate this driver. It's also poking at ports without being told
something is there by either system or user.
Trivial remainder of init rewrite that's still applicable:
Rene.
>From fc64af262b44d41cd45fbe96be301e4662ba1c1a Mon Sep 17 00:00:00 2001
From: Rene Herman <rene.herman@xxxxxxxxx>
Date: Fri, 18 Jul 2008 11:15:12 +0200
Subject: [PATCH] ALSA: opti9xx: no isapnp param for !CONFIG_PNP
"isapnp" needs CONFIG_PNP to be useful.
Signed-off-by: Rene Herman <rene.herman@xxxxxxxxx>
---
sound/isa/opti9xx/opti92x-ad1848.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index e5d9028..5dfead9 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -68,7 +68,9 @@ MODULE_SUPPORTED_DEVICE("{{OPTi,82C924 (AD1848)},"
static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */
//static int enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */
+#ifdef CONFIG_PNP
static int isapnp = 1; /* Enable ISA PnP detection */
+#endif
static long port = SNDRV_DEFAULT_PORT1; /* 0x530,0xe80,0xf40,0x604 */
static long mpu_port = SNDRV_DEFAULT_PORT1; /* 0x300,0x310,0x320,0x330 */
static long fm_port = SNDRV_DEFAULT_PORT1; /* 0x388 */
@@ -85,8 +87,10 @@ module_param(id, charp, 0444);
MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard.");
//module_param(enable, bool, 0444);
//MODULE_PARM_DESC(enable, "Enable opti9xx soundcard.");
+#ifdef CONFIG_PNP
module_param(isapnp, bool, 0444);
MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard.");
+#endif
module_param(port, long, 0444);
MODULE_PARM_DESC(port, "WSS port # for opti9xx driver.");
module_param(mpu_port, long, 0444);
--
1.5.5
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
