diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-02-20 11:57:34 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 10:30:43 +0100 |
| commit | 8278ca8feb2748cf02d756ac6c5b9ab2e047c84a (patch) | |
| tree | a58ddfa8d7ac897c02e4ba3bda9b77e278348fbf /sound/isa/sb | |
| parent | 1a56f8d662ec7fc86f2c408d289fa07cdb781746 (diff) | |
| download | op-kernel-dev-8278ca8feb2748cf02d756ac6c5b9ab2e047c84a.zip op-kernel-dev-8278ca8feb2748cf02d756ac6c5b9ab2e047c84a.tar.gz | |
[ALSA] Fix check of enable module option
Fix the check of enable module option in probe of platform_device drivers.
It shouldn't break the loop but just ignore if enable[i] is false.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/sb')
| -rw-r--r-- | sound/isa/sb/sb16.c | 4 | ||||
| -rw-r--r-- | sound/isa/sb/sb8.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c index 0667bd1..5737ab7 100644 --- a/sound/isa/sb/sb16.c +++ b/sound/isa/sb/sb16.c @@ -712,9 +712,9 @@ static int __init alsa_card_sb16_init(void) if ((err = platform_driver_register(&snd_sb16_nonpnp_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(SND_SB16_DRIVER, i, NULL, 0); diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c index 60ee79c..3efa23d 100644 --- a/sound/isa/sb/sb8.c +++ b/sound/isa/sb/sb8.c @@ -258,8 +258,10 @@ static int __init alsa_card_sb8_init(void) return err; cards = 0; - for (i = 0; i < SNDRV_CARDS && enable[i]; i++) { + for (i = 0; i < SNDRV_CARDS; i++) { struct platform_device *device; + if (! enable[i]) + continue; device = platform_device_register_simple(SND_SB8_DRIVER, i, NULL, 0); if (IS_ERR(device)) { |
