aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorRene Herman <rene.herman@keyaccess.nl>2006-03-27 13:50:11 +0200
committerJaroslav Kysela <perex@suse.cz>2006-03-31 17:58:58 +0200
commit82756b2785c5f08204e7f3dab64e12d4533bfe89 (patch)
treead4379ec6710f9a47cfb30158cbe2ab29a959046 /sound
parent43560116d1f70de274915fdec0745c6e02feef30 (diff)
downloadlinux-2.6.34-ux500-82756b2785c5f08204e7f3dab64e12d4533bfe89.tar.gz
[ALSA] ISA drivers bailing on first !enable[i]
Fix the wrong check of enable option in cmi8330 driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/cmi8330.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index fa63048a8b9..bc0f5ebf5d3 100644
--- a/sound/isa/cmi8330.c
+++ b/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);