From f0b540fd6e69b779de324df2bf52553ac9cd9dd9 Mon Sep 17 00:00:00 2001
From: Rene Herman <rene.herman@keyaccess.nl>
Date: Mon, 27 Mar 2006 13:50:11 +0200
Subject: [PATCH] --- yaml --- r: 25255 b: refs/heads/master c:
 82756b2785c5f08204e7f3dab64e12d4533bfe89 h: refs/heads/master i:   25253:
 da64084cb7fd2552f7fd7dbcf2e93e93facf07cd   25251:
 9ab5278c7d9f62b59ca786f8f733939769f0450a   25247:
 08002916ee7e56dd2d0feb11f65480495ec6609f v: v3

---
 [refs]                    | 2 +-
 trunk/sound/isa/cmi8330.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7b5f8a73b32a..330ace37d0d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43560116d1f70de274915fdec0745c6e02feef30
+refs/heads/master: 82756b2785c5f08204e7f3dab64e12d4533bfe89
diff --git a/trunk/sound/isa/cmi8330.c b/trunk/sound/isa/cmi8330.c
index fa63048a8b9d..bc0f5ebf5d3c 100644
--- a/trunk/sound/isa/cmi8330.c
+++ b/trunk/sound/isa/cmi8330.c
@@ -693,9 +693,9 @@ static int __init alsa_card_cmi8330_init(void)
 	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);