diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-02-20 05:57:34 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 04:30:43 -0500 |
commit | 8278ca8feb2748cf02d756ac6c5b9ab2e047c84a (patch) | |
tree | a58ddfa8d7ac897c02e4ba3bda9b77e278348fbf /sound/isa/sb | |
parent | 1a56f8d662ec7fc86f2c408d289fa07cdb781746 (diff) |
[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 0667bd14ad60..5737ab76160c 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) | |||
712 | if ((err = platform_driver_register(&snd_sb16_nonpnp_driver)) < 0) | 712 | if ((err = platform_driver_register(&snd_sb16_nonpnp_driver)) < 0) |
713 | return err; | 713 | return err; |
714 | 714 | ||
715 | for (i = 0; i < SNDRV_CARDS && enable[i]; i++) { | 715 | for (i = 0; i < SNDRV_CARDS; i++) { |
716 | struct platform_device *device; | 716 | struct platform_device *device; |
717 | if (is_isapnp_selected(i)) | 717 | if (! enable[i] || is_isapnp_selected(i)) |
718 | continue; | 718 | continue; |
719 | device = platform_device_register_simple(SND_SB16_DRIVER, | 719 | device = platform_device_register_simple(SND_SB16_DRIVER, |
720 | i, NULL, 0); | 720 | i, NULL, 0); |
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c index 60ee79cd14a3..3efa23d303c3 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) | |||
258 | return err; | 258 | return err; |
259 | 259 | ||
260 | cards = 0; | 260 | cards = 0; |
261 | for (i = 0; i < SNDRV_CARDS && enable[i]; i++) { | 261 | for (i = 0; i < SNDRV_CARDS; i++) { |
262 | struct platform_device *device; | 262 | struct platform_device *device; |
263 | if (! enable[i]) | ||
264 | continue; | ||
263 | device = platform_device_register_simple(SND_SB8_DRIVER, | 265 | device = platform_device_register_simple(SND_SB8_DRIVER, |
264 | i, NULL, 0); | 266 | i, NULL, 0); |
265 | if (IS_ERR(device)) { | 267 | if (IS_ERR(device)) { |