Re: [ALSA] ISA drivers bailing on first !enable[i]

[Rene Herman <rene.herman@keyaccess.nl>]

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

Takashi Iwai wrote:

>> Assuming this was indeed the idea, I've attached a patch against 2.6.16.
>> If it's correct, but you need it against ALSA CVS instead, please say so
> 
> Yes, these are correct fixes.  Most of them should have been already
> in the latest ALSA tree, i.e. also in Linus git tree now.

I had a feeling I should've checked that when I was composing the message...

> Could you check what's still missing?  I might missed some drivers.

CMI8330 was missing, see attached (generated against -git9). Yes, the 
original patch is still useful for -stable; will submit.

Rene.

[-- Attachment #2: alsa_cmi8330_enable.diff --]
[-- Type: text/plain, Size: 712 bytes --]

Index: linux-2.6.16-git9/sound/isa/cmi8330.c
===================================================================
--- linux-2.6.16-git9.orig/sound/isa/cmi8330.c	2006-03-20 06:53:29.000000000 +0100
+++ linux-2.6.16-git9/sound/isa/cmi8330.c	2006-03-25 01:10:37.000000000 +0100
@@ -690,9 +690,9 @@ static int __init alsa_card_cmi8330_init
 	if ((err = platform_driver_register(&snd_cmi8330_driver)) < 0)
 		return err;
 
-	for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
+	for (i = 0; i < SNDRV_CARDS; i++) {
 		struct platform_device *device;
-		if (is_isapnp_selected(i))
+		if (! enable[i] || is_isapnp_selected(i))
 			continue;
 		device = platform_device_register_simple(CMI8330_DRIVER,
 							 i, NULL, 0);